From 53188d9cb8d00c333f3515525f729a7918b50013 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 15 Oct 2015 10:50:47 -0700
Subject: [PATCH] Add ES2015 as a synonym to ES6

In ModuleKind, ScriptTarget and associated command line arguments.
---
 src/compiler/commandLineParser.ts             |  8 ++++++-
 src/compiler/types.ts                         |  4 +++-
 tests/baselines/reference/es2015modulekind.js | 23 +++++++++++++++++++
 .../reference/es2015modulekind.symbols        | 16 +++++++++++++
 .../reference/es2015modulekind.types          | 17 ++++++++++++++
 .../es2015modulekindWithES6Target.js          | 23 +++++++++++++++++++
 .../es2015modulekindWithES6Target.symbols     | 16 +++++++++++++
 .../es2015modulekindWithES6Target.types       | 17 ++++++++++++++
 .../es6modulekindWithES2015Target.js          | 23 +++++++++++++++++++
 .../es6modulekindWithES2015Target.symbols     | 16 +++++++++++++
 .../es6modulekindWithES2015Target.types       | 17 ++++++++++++++
 tests/cases/compiler/es2015modulekind.ts      | 17 ++++++++++++++
 .../compiler/es2015modulekindWithES6Target.ts | 17 ++++++++++++++
 .../compiler/es6modulekindWithES2015Target.ts | 17 ++++++++++++++
 14 files changed, 229 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/es2015modulekind.js
 create mode 100644 tests/baselines/reference/es2015modulekind.symbols
 create mode 100644 tests/baselines/reference/es2015modulekind.types
 create mode 100644 tests/baselines/reference/es2015modulekindWithES6Target.js
 create mode 100644 tests/baselines/reference/es2015modulekindWithES6Target.symbols
 create mode 100644 tests/baselines/reference/es2015modulekindWithES6Target.types
 create mode 100644 tests/baselines/reference/es6modulekindWithES2015Target.js
 create mode 100644 tests/baselines/reference/es6modulekindWithES2015Target.symbols
 create mode 100644 tests/baselines/reference/es6modulekindWithES2015Target.types
 create mode 100644 tests/cases/compiler/es2015modulekind.ts
 create mode 100644 tests/cases/compiler/es2015modulekindWithES6Target.ts
 create mode 100644 tests/cases/compiler/es6modulekindWithES2015Target.ts

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 37755ee3258..acf0474b7bf 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -77,6 +77,7 @@ namespace ts {
                 "system": ModuleKind.System,
                 "umd": ModuleKind.UMD,
                 "es6": ModuleKind.ES6,
+                "es2015": ModuleKind.ES2015,
             },
             description: Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es6,
             paramType: Diagnostics.KIND,
@@ -205,7 +206,12 @@ namespace ts {
         {
             name: "target",
             shortName: "t",
-            type: { "es3": ScriptTarget.ES3, "es5": ScriptTarget.ES5, "es6": ScriptTarget.ES6 },
+            type: {
+                "es3": ScriptTarget.ES3,
+                "es5": ScriptTarget.ES5,
+                "es6": ScriptTarget.ES6,
+                "es2015": ScriptTarget.ES2015,
+            },
             description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
             paramType: Diagnostics.VERSION,
             error: Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES6
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 6e5528b8217..c44c6ad2cc0 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2103,6 +2103,7 @@ namespace ts {
         UMD = 3,
         System = 4,
         ES6 = 5,
+        ES2015 = ES6,
     }
 
     export const enum JsxEmit {
@@ -2128,12 +2129,13 @@ namespace ts {
         ES3 = 0,
         ES5 = 1,
         ES6 = 2,
+        ES2015 = ES6,
         Latest = ES6,
     }
 
     export const enum LanguageVariant {
         Standard,
-        JSX
+        JSX,
     }
 
     export interface ParsedCommandLine {
diff --git a/tests/baselines/reference/es2015modulekind.js b/tests/baselines/reference/es2015modulekind.js
new file mode 100644
index 00000000000..af638557fde
--- /dev/null
+++ b/tests/baselines/reference/es2015modulekind.js
@@ -0,0 +1,23 @@
+//// [es2015modulekind.ts]
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
+
+//// [es2015modulekind.js]
+export default class A {
+    constructor() {
+    }
+    B() {
+        return 42;
+    }
+}
diff --git a/tests/baselines/reference/es2015modulekind.symbols b/tests/baselines/reference/es2015modulekind.symbols
new file mode 100644
index 00000000000..227443ac06b
--- /dev/null
+++ b/tests/baselines/reference/es2015modulekind.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/es2015modulekind.ts ===
+
+export default class A
+>A : Symbol(A, Decl(es2015modulekind.ts, 0, 0))
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : Symbol(B, Decl(es2015modulekind.ts, 6, 5))
+    {
+        return 42;
+    }
+}
diff --git a/tests/baselines/reference/es2015modulekind.types b/tests/baselines/reference/es2015modulekind.types
new file mode 100644
index 00000000000..e77cf095aed
--- /dev/null
+++ b/tests/baselines/reference/es2015modulekind.types
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/es2015modulekind.ts ===
+
+export default class A
+>A : A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : () => number
+    {
+        return 42;
+>42 : number
+    }
+}
diff --git a/tests/baselines/reference/es2015modulekindWithES6Target.js b/tests/baselines/reference/es2015modulekindWithES6Target.js
new file mode 100644
index 00000000000..b76ab2a02a2
--- /dev/null
+++ b/tests/baselines/reference/es2015modulekindWithES6Target.js
@@ -0,0 +1,23 @@
+//// [es2015modulekindWithES6Target.ts]
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
+
+//// [es2015modulekindWithES6Target.js]
+export default class A {
+    constructor() {
+    }
+    B() {
+        return 42;
+    }
+}
diff --git a/tests/baselines/reference/es2015modulekindWithES6Target.symbols b/tests/baselines/reference/es2015modulekindWithES6Target.symbols
new file mode 100644
index 00000000000..2ff208ac704
--- /dev/null
+++ b/tests/baselines/reference/es2015modulekindWithES6Target.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/es2015modulekindWithES6Target.ts ===
+
+export default class A
+>A : Symbol(A, Decl(es2015modulekindWithES6Target.ts, 0, 0))
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : Symbol(B, Decl(es2015modulekindWithES6Target.ts, 6, 5))
+    {
+        return 42;
+    }
+}
diff --git a/tests/baselines/reference/es2015modulekindWithES6Target.types b/tests/baselines/reference/es2015modulekindWithES6Target.types
new file mode 100644
index 00000000000..50b85921b0e
--- /dev/null
+++ b/tests/baselines/reference/es2015modulekindWithES6Target.types
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/es2015modulekindWithES6Target.ts ===
+
+export default class A
+>A : A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : () => number
+    {
+        return 42;
+>42 : number
+    }
+}
diff --git a/tests/baselines/reference/es6modulekindWithES2015Target.js b/tests/baselines/reference/es6modulekindWithES2015Target.js
new file mode 100644
index 00000000000..98808fd1c65
--- /dev/null
+++ b/tests/baselines/reference/es6modulekindWithES2015Target.js
@@ -0,0 +1,23 @@
+//// [es6modulekindWithES2015Target.ts]
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
+
+//// [es6modulekindWithES2015Target.js]
+export default class A {
+    constructor() {
+    }
+    B() {
+        return 42;
+    }
+}
diff --git a/tests/baselines/reference/es6modulekindWithES2015Target.symbols b/tests/baselines/reference/es6modulekindWithES2015Target.symbols
new file mode 100644
index 00000000000..98b91a0411b
--- /dev/null
+++ b/tests/baselines/reference/es6modulekindWithES2015Target.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/es6modulekindWithES2015Target.ts ===
+
+export default class A
+>A : Symbol(A, Decl(es6modulekindWithES2015Target.ts, 0, 0))
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : Symbol(B, Decl(es6modulekindWithES2015Target.ts, 6, 5))
+    {
+        return 42;
+    }
+}
diff --git a/tests/baselines/reference/es6modulekindWithES2015Target.types b/tests/baselines/reference/es6modulekindWithES2015Target.types
new file mode 100644
index 00000000000..63acdae43d1
--- /dev/null
+++ b/tests/baselines/reference/es6modulekindWithES2015Target.types
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/es6modulekindWithES2015Target.ts ===
+
+export default class A
+>A : A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : () => number
+    {
+        return 42;
+>42 : number
+    }
+}
diff --git a/tests/cases/compiler/es2015modulekind.ts b/tests/cases/compiler/es2015modulekind.ts
new file mode 100644
index 00000000000..6e1f584844a
--- /dev/null
+++ b/tests/cases/compiler/es2015modulekind.ts
@@ -0,0 +1,17 @@
+// @target: es2015
+// @sourcemap: false
+// @declaration: false
+// @module: es2015
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es2015modulekindWithES6Target.ts b/tests/cases/compiler/es2015modulekindWithES6Target.ts
new file mode 100644
index 00000000000..78809d3835f
--- /dev/null
+++ b/tests/cases/compiler/es2015modulekindWithES6Target.ts
@@ -0,0 +1,17 @@
+// @target: es6
+// @sourcemap: false
+// @declaration: false
+// @module: es2015
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es6modulekindWithES2015Target.ts b/tests/cases/compiler/es6modulekindWithES2015Target.ts
new file mode 100644
index 00000000000..aaf79e6607d
--- /dev/null
+++ b/tests/cases/compiler/es6modulekindWithES2015Target.ts
@@ -0,0 +1,17 @@
+// @target: es2015
+// @sourcemap: false
+// @declaration: false
+// @module: es6
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
\ No newline at end of file