From 0fcc63e33e5a8d1f9d63e28d3de5e356c0e3f7e4 Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Thu, 2 Jul 2015 16:13:38 -0700
Subject: [PATCH 1/2] Disallow modifiers on rest parameters

---
 src/compiler/parser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index c257f6c702e..f2f39b7495c 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1979,8 +1979,8 @@ namespace ts {
         function parseParameter(): ParameterDeclaration {
             let node = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
             node.decorators = parseDecorators();
-            node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
             setModifiers(node, parseModifiers());
+            node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
 
             // FormalParameter [Yield,Await]:
             //      BindingElement[?Yield,?Await]

From 35db9f68f426e452322c05619ad92ae45c6f626b Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Thu, 2 Jul 2015 16:13:47 -0700
Subject: [PATCH 2/2] Add tests

---
 .../reference/restParamModifier.errors.txt    | 21 +++++++++++++++++++
 .../baselines/reference/restParamModifier.js  | 12 +++++++++++
 .../reference/restParamModifier2.errors.txt   |  9 ++++++++
 .../baselines/reference/restParamModifier2.js | 15 +++++++++++++
 tests/cases/compiler/restParamModifier.ts     |  3 +++
 tests/cases/compiler/restParamModifier2.ts    |  3 +++
 6 files changed, 63 insertions(+)
 create mode 100644 tests/baselines/reference/restParamModifier.errors.txt
 create mode 100644 tests/baselines/reference/restParamModifier.js
 create mode 100644 tests/baselines/reference/restParamModifier2.errors.txt
 create mode 100644 tests/baselines/reference/restParamModifier2.js
 create mode 100644 tests/cases/compiler/restParamModifier.ts
 create mode 100644 tests/cases/compiler/restParamModifier2.ts

diff --git a/tests/baselines/reference/restParamModifier.errors.txt b/tests/baselines/reference/restParamModifier.errors.txt
new file mode 100644
index 00000000000..87c73fcdc71
--- /dev/null
+++ b/tests/baselines/reference/restParamModifier.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/compiler/restParamModifier.ts(2,17): error TS2370: A rest parameter must be of an array type.
+tests/cases/compiler/restParamModifier.ts(2,27): error TS1005: '=' expected.
+tests/cases/compiler/restParamModifier.ts(2,27): error TS2304: Cannot find name 'rest'.
+tests/cases/compiler/restParamModifier.ts(2,31): error TS1005: ',' expected.
+tests/cases/compiler/restParamModifier.ts(2,39): error TS1005: '=' expected.
+
+
+==== tests/cases/compiler/restParamModifier.ts (5 errors) ====
+    class C {
+        constructor(...public rest: string[]) {}
+                    ~~~~~~~~~~~~~~
+!!! error TS2370: A rest parameter must be of an array type.
+                              ~~~~
+!!! error TS1005: '=' expected.
+                              ~~~~
+!!! error TS2304: Cannot find name 'rest'.
+                                  ~
+!!! error TS1005: ',' expected.
+                                          ~
+!!! error TS1005: '=' expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/restParamModifier.js b/tests/baselines/reference/restParamModifier.js
new file mode 100644
index 00000000000..9a780321dc9
--- /dev/null
+++ b/tests/baselines/reference/restParamModifier.js
@@ -0,0 +1,12 @@
+//// [restParamModifier.ts]
+class C {
+    constructor(...public rest: string[]) {}
+}
+
+//// [restParamModifier.js]
+var C = (function () {
+    function C(public, string) {
+        if (string === void 0) { string = []; }
+    }
+    return C;
+})();
diff --git a/tests/baselines/reference/restParamModifier2.errors.txt b/tests/baselines/reference/restParamModifier2.errors.txt
new file mode 100644
index 00000000000..773592fa9bf
--- /dev/null
+++ b/tests/baselines/reference/restParamModifier2.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/compiler/restParamModifier2.ts(2,24): error TS1005: ',' expected.
+
+
+==== tests/cases/compiler/restParamModifier2.ts (1 errors) ====
+    class C {
+        constructor(public ...rest: string[]) {}
+                           ~~~
+!!! error TS1005: ',' expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/restParamModifier2.js b/tests/baselines/reference/restParamModifier2.js
new file mode 100644
index 00000000000..c588c945ce4
--- /dev/null
+++ b/tests/baselines/reference/restParamModifier2.js
@@ -0,0 +1,15 @@
+//// [restParamModifier2.ts]
+class C {
+    constructor(public ...rest: string[]) {}
+}
+
+//// [restParamModifier2.js]
+var C = (function () {
+    function C(public) {
+        var rest = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rest[_i - 1] = arguments[_i];
+        }
+    }
+    return C;
+})();
diff --git a/tests/cases/compiler/restParamModifier.ts b/tests/cases/compiler/restParamModifier.ts
new file mode 100644
index 00000000000..220b7d36d5e
--- /dev/null
+++ b/tests/cases/compiler/restParamModifier.ts
@@ -0,0 +1,3 @@
+class C {
+    constructor(...public rest: string[]) {}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/restParamModifier2.ts b/tests/cases/compiler/restParamModifier2.ts
new file mode 100644
index 00000000000..e007bc56d7c
--- /dev/null
+++ b/tests/cases/compiler/restParamModifier2.ts
@@ -0,0 +1,3 @@
+class C {
+    constructor(public ...rest: string[]) {}
+}
\ No newline at end of file