From 18a875807c02fc1e537fbe7a6dd6bded6f8ebd03 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Sun, 5 Jun 2016 15:37:20 -0700
Subject: [PATCH] Remove restriction on --target es5 and --module es6

---
 src/compiler/diagnosticMessages.json          |  4 ----
 src/compiler/program.ts                       |  5 -----
 .../reference/es5andes6module.errors.txt      | 19 -------------------
 .../reference/es5andes6module.symbols         | 17 +++++++++++++++++
 .../baselines/reference/es5andes6module.types | 18 ++++++++++++++++++
 .../shorthand-property-es5-es6.errors.txt     |  2 --
 6 files changed, 35 insertions(+), 30 deletions(-)
 delete mode 100644 tests/baselines/reference/es5andes6module.errors.txt
 create mode 100644 tests/baselines/reference/es5andes6module.symbols
 create mode 100644 tests/baselines/reference/es5andes6module.types

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 034bd27b147..108a4fa0889 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -635,10 +635,6 @@
         "category": "Error",
         "code": 1203
     },
-    "Cannot compile modules into 'es2015' when targeting 'ES5' or lower.": {
-        "category": "Error",
-        "code": 1204
-    },
     "Decorators are not valid here.": {
         "category": "Error",
         "code": 1206
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index bab554927e7..fff92d02059 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -2099,11 +2099,6 @@ namespace ts {
                 programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none));
             }
 
-            // 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_es2015_when_targeting_ES5_or_lower));
-            }
-
             // Cannot specify module gen that isn't amd or system with --out
             if (outFile) {
                 if (options.module && !(options.module === ModuleKind.AMD || options.module === ModuleKind.System)) {
diff --git a/tests/baselines/reference/es5andes6module.errors.txt b/tests/baselines/reference/es5andes6module.errors.txt
deleted file mode 100644
index 6908bfc8ae6..00000000000
--- a/tests/baselines/reference/es5andes6module.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS1204: Cannot compile modules into 'es2015' 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
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5andes6module.symbols b/tests/baselines/reference/es5andes6module.symbols
new file mode 100644
index 00000000000..3aef923de0a
--- /dev/null
+++ b/tests/baselines/reference/es5andes6module.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/es5andes6module.ts ===
+
+export default class A
+>A : Symbol(A, Decl(es5andes6module.ts, 0, 0))
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : Symbol(A.B, Decl(es5andes6module.ts, 6, 5))
+    {
+        return 42;
+    }
+}
+
diff --git a/tests/baselines/reference/es5andes6module.types b/tests/baselines/reference/es5andes6module.types
new file mode 100644
index 00000000000..14423d87cea
--- /dev/null
+++ b/tests/baselines/reference/es5andes6module.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/es5andes6module.ts ===
+
+export default class A
+>A : A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : () => number
+    {
+        return 42;
+>42 : number
+    }
+}
+
diff --git a/tests/baselines/reference/shorthand-property-es5-es6.errors.txt b/tests/baselines/reference/shorthand-property-es5-es6.errors.txt
index f491dfbaabe..e54f73a4e61 100644
--- a/tests/baselines/reference/shorthand-property-es5-es6.errors.txt
+++ b/tests/baselines/reference/shorthand-property-es5-es6.errors.txt
@@ -1,8 +1,6 @@
-error TS1204: Cannot compile modules into 'es2015' when targeting 'ES5' or lower.
 tests/cases/compiler/test.ts(2,19): error TS2307: Cannot find module './foo'.
 
 
-!!! error TS1204: Cannot compile modules into 'es2015' when targeting 'ES5' or lower.
 ==== tests/cases/compiler/test.ts (1 errors) ====
     
     import {foo} from './foo';