dfahlander
diff --git a/‎src/compiler/checker.ts‎
Lines changed: 3 additions & 3 deletions b/‎src/compiler/checker.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/compiler/emitter.ts‎
Lines changed: 4 additions & 4 deletions b/‎src/compiler/emitter.ts‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/compiler/program.ts‎
Lines changed: 4 additions & 2 deletions b/‎src/compiler/program.ts‎
Lines changed: 4 additions & 2 deletions
@@ -724,7 +724,7 @@ module ts {
         }
 
         function getExportsForModule(moduleSymbol: Symbol): SymbolTable {
-            if (compilerOptions.target < ScriptTarget.ES6) {
+            if (languageVersion < ScriptTarget.ES6) {
                 // A default export hides all other exports in CommonJS and AMD modules
                 var defaultSymbol = getExportAssignmentSymbol(moduleSymbol);
                 if (defaultSymbol) {
@@ -9902,7 +9902,7 @@ module ts {
                     }
                 }
                 else {
-                    if (compilerOptions.target >= ScriptTarget.ES6) {
+                    if (languageVersion >= ScriptTarget.ES6) {
                         // Import equals declaration is deprecated in es6 or above
                         grammarErrorOnNode(node, Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_import_Asterisk_from_mod_import_a_from_mod_or_import_d_from_mod_instead);
                     }
@@ -9946,7 +9946,7 @@ module ts {
             }
             checkExternalModuleExports(container);
 
-            if (compilerOptions.target >= ScriptTarget.ES6) {
+            if (languageVersion >= ScriptTarget.ES6) {
                 // export assignment is deprecated in es6 or above
                 grammarErrorOnNode(node, Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_export_default_instead);
             }
 
@@ -3228,7 +3228,7 @@ module ts {
             }
 
             function emitTaggedTemplateExpression(node: TaggedTemplateExpression): void {
-                if (compilerOptions.target >= ScriptTarget.ES6) {
+                if (languageVersion >= ScriptTarget.ES6) {
                     emit(node.tag);
                     write(" ");
                     emit(node.template);
@@ -4997,7 +4997,7 @@ module ts {
             }
 
             function emitImportDeclaration(node: ImportDeclaration) {
-                if (compilerOptions.target < ScriptTarget.ES6) {
+                if (languageVersion < ScriptTarget.ES6) {
                     return emitExternalImportDeclaration(node);
                 }
 
@@ -5067,7 +5067,7 @@ module ts {
             }
 
             function emitImportSpecifier(node: ImportSpecifier) {
-                Debug.assert(compilerOptions.target >= ScriptTarget.ES6);
+                Debug.assert(languageVersion >= ScriptTarget.ES6);
                 if (node.propertyName) {
                     emit(node.propertyName);
                     write(" as ");
@@ -5413,7 +5413,7 @@ module ts {
                     extendsEmitted = true;
                 }
                 if (isExternalModule(node)) {
-                    if (compilerOptions.target >= ScriptTarget.ES6) {
+                    if (languageVersion >= ScriptTarget.ES6) {
                         emitES6Module(node, startIndex);
                     }
                     else if (compilerOptions.module === ModuleKind.AMD) {
 
@@ -426,17 +426,19 @@ module ts {
                 return;
             }
 
+            var languageVersion = options.target || ScriptTarget.ES3;
+
             var firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined);
             if (firstExternalModuleSourceFile && !options.module) {
-                if (!options.module && options.target < ScriptTarget.ES6) {
+                if (!options.module && languageVersion < ScriptTarget.ES6) {
                     // We cannot use createDiagnosticFromNode because nodes do not have parents yet 
                     var span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
                     diagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided));
                 }
             }
 
             // Cannot specify module gen target when in es6 or above
-            if (options.module && options.target >= ScriptTarget.ES6) {
+            if (options.module && languageVersion >= ScriptTarget.ES6) {
                 diagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_compile_external_modules_into_amd_or_commonjs_when_targeting_es6_or_higher));
             }
Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@ module ts {`
`724`	`724`	`}`
`725`	`725`
`726`	`726`	`function getExportsForModule(moduleSymbol: Symbol): SymbolTable {`
`727`		`- if (compilerOptions.target < ScriptTarget.ES6) {`
	`727`	`+ if (languageVersion < ScriptTarget.ES6) {`
`728`	`728`	`// A default export hides all other exports in CommonJS and AMD modules`
`729`	`729`	`var defaultSymbol = getExportAssignmentSymbol(moduleSymbol);`
`730`	`730`	`if (defaultSymbol) {`
`@@ -9902,7 +9902,7 @@ module ts {`
`9902`	`9902`	`}`
`9903`	`9903`	`}`
`9904`	`9904`	`else {`
`9905`		`- if (compilerOptions.target >= ScriptTarget.ES6) {`
	`9905`	`+ if (languageVersion >= ScriptTarget.ES6) {`
`9906`	`9906`	`// Import equals declaration is deprecated in es6 or above`
`9907`	`9907`	`grammarErrorOnNode(node, Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_import_Asterisk_from_mod_import_a_from_mod_or_import_d_from_mod_instead);`
`9908`	`9908`	`}`
`@@ -9946,7 +9946,7 @@ module ts {`
`9946`	`9946`	`}`
`9947`	`9947`	`checkExternalModuleExports(container);`
`9948`	`9948`
`9949`		`- if (compilerOptions.target >= ScriptTarget.ES6) {`
	`9949`	`+ if (languageVersion >= ScriptTarget.ES6) {`
`9950`	`9950`	`// export assignment is deprecated in es6 or above`
`9951`	`9951`	`grammarErrorOnNode(node, Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_export_default_instead);`
`9952`	`9952`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3228,7 +3228,7 @@ module ts {`
`3228`	`3228`	`}`
`3229`	`3229`
`3230`	`3230`	`function emitTaggedTemplateExpression(node: TaggedTemplateExpression): void {`
`3231`		`- if (compilerOptions.target >= ScriptTarget.ES6) {`
	`3231`	`+ if (languageVersion >= ScriptTarget.ES6) {`
`3232`	`3232`	`emit(node.tag);`
`3233`	`3233`	`write(" ");`
`3234`	`3234`	`emit(node.template);`
`@@ -4997,7 +4997,7 @@ module ts {`
`4997`	`4997`	`}`
`4998`	`4998`
`4999`	`4999`	`function emitImportDeclaration(node: ImportDeclaration) {`
`5000`		`- if (compilerOptions.target < ScriptTarget.ES6) {`
	`5000`	`+ if (languageVersion < ScriptTarget.ES6) {`
`5001`	`5001`	`return emitExternalImportDeclaration(node);`
`5002`	`5002`	`}`
`5003`	`5003`
`@@ -5067,7 +5067,7 @@ module ts {`
`5067`	`5067`	`}`
`5068`	`5068`
`5069`	`5069`	`function emitImportSpecifier(node: ImportSpecifier) {`
`5070`		`- Debug.assert(compilerOptions.target >= ScriptTarget.ES6);`
	`5070`	`+ Debug.assert(languageVersion >= ScriptTarget.ES6);`
`5071`	`5071`	`if (node.propertyName) {`
`5072`	`5072`	`emit(node.propertyName);`
`5073`	`5073`	`write(" as ");`
`@@ -5413,7 +5413,7 @@ module ts {`
`5413`	`5413`	`extendsEmitted = true;`
`5414`	`5414`	`}`
`5415`	`5415`	`if (isExternalModule(node)) {`
`5416`		`- if (compilerOptions.target >= ScriptTarget.ES6) {`
	`5416`	`+ if (languageVersion >= ScriptTarget.ES6) {`
`5417`	`5417`	`emitES6Module(node, startIndex);`
`5418`	`5418`	`}`
`5419`	`5419`	`else if (compilerOptions.module === ModuleKind.AMD) {`
Original file line number	Diff line number	Diff line change
`@@ -426,17 +426,19 @@ module ts {`
`426`	`426`	`return;`
`427`	`427`	`}`
`428`	`428`
	`429`	`+ var languageVersion = options.target \|\| ScriptTarget.ES3;`
	`430`	`+`
`429`	`431`	`var firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined);`
`430`	`432`	`if (firstExternalModuleSourceFile && !options.module) {`
`431`		`- if (!options.module && options.target < ScriptTarget.ES6) {`
	`433`	`+ if (!options.module && languageVersion < ScriptTarget.ES6) {`
`432`	`434`	`// We cannot use createDiagnosticFromNode because nodes do not have parents yet`
`433`	`435`	`var span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);`
`434`	`436`	`diagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided));`
`435`	`437`	`}`
`436`	`438`	`}`
`437`	`439`
`438`	`440`	`// Cannot specify module gen target when in es6 or above`
`439`		`- if (options.module && options.target >= ScriptTarget.ES6) {`
	`441`	`+ if (options.module && languageVersion >= ScriptTarget.ES6) {`
`440`	`442`	`diagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_compile_external_modules_into_amd_or_commonjs_when_targeting_es6_or_higher));`
`441`	`443`	`}`
`442`	`444`