From 231f522d8967dd103246ed4f7aeb2048b7ffff64 Mon Sep 17 00:00:00 2001
From: Caitlin Potter <caitpotter88@gmail.com>
Date: Tue, 10 Mar 2015 17:20:28 -0400
Subject: [PATCH] Add additional test-cases for arrow function grammar

As suggested by @DanielRosenwasser
---
 ...sallowLineTerminatorBeforeArrow.errors.txt | 37 +++++++++++++++-
 .../disallowLineTerminatorBeforeArrow.js      | 42 +++++++++++++++++++
 .../disallowLineTerminatorBeforeArrow.ts      | 19 +++++++++
 3 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.errors.txt b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.errors.txt
index c64d42b7fff..e9f07998504 100644
--- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.errors.txt
+++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.errors.txt
@@ -8,9 +8,13 @@ tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts(1
 tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts(15,10): error TS1200: Line terminator not permitted before arrow.
 tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts(19,5): error TS1200: Line terminator not permitted before arrow.
 tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts(21,5): error TS1200: Line terminator not permitted before arrow.
+tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts(26,40): error TS1200: Line terminator not permitted before arrow.
+tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts(30,20): error TS1200: Line terminator not permitted before arrow.
+tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts(35,17): error TS1200: Line terminator not permitted before arrow.
+tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts(39,20): error TS1200: Line terminator not permitted before arrow.
 
 
-==== tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts (10 errors) ====
+==== tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts (14 errors) ====
     var f1 = ()
              ~~
         => { }
@@ -63,4 +67,35 @@ tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts(2
         => { return false; });
     ~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1200: Line terminator not permitted before arrow.
+    
+    module m {
+        class City {
+            constructor(x: number, thing = ()
+                                           ~~
+                => 100) {
+    ~~~~~~~~~~~~~~~~~~
+!!! error TS1200: Line terminator not permitted before arrow.
+            }
+    
+            public m = ()
+                       ~~
+                => 2 * 2 * 2
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1200: Line terminator not permitted before arrow.
+        }
+    
+        export enum Enum {
+            claw = (()
+                    ~~
+                => 10)()
+    ~~~~~~~~~~~~~~~~~
+!!! error TS1200: Line terminator not permitted before arrow.
+        }
+    
+        export var v = x
+                       ~
+            => new City(Enum.claw);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1200: Line terminator not permitted before arrow.
+    }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
index 2619b41bf38..122c229d7d9 100644
--- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
+++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
@@ -21,6 +21,25 @@ foo(()
     => true);
 foo(()
     => { return false; });
+
+module m {
+    class City {
+        constructor(x: number, thing = ()
+            => 100) {
+        }
+
+        public m = ()
+            => 2 * 2 * 2
+    }
+
+    export enum Enum {
+        claw = (()
+            => 10)()
+    }
+
+    export var v = x
+        => new City(Enum.claw);
+}
 
 
 //// [disallowLineTerminatorBeforeArrow.js]
@@ -66,3 +85,26 @@ foo(function () {
 foo(function () {
     return false;
 });
+var m;
+(function (m) {
+    var City = (function () {
+        function City(x, thing) {
+            if (thing === void 0) { thing = function () {
+                return 100;
+            }; }
+            this.m = function () {
+                return 2 * 2 * 2;
+            };
+        }
+        return City;
+    })();
+    (function (Enum) {
+        Enum[Enum["claw"] = (function () {
+            return 10;
+        })()] = "claw";
+    })(m.Enum || (m.Enum = {}));
+    var Enum = m.Enum;
+    m.v = function (x) {
+        return new City(Enum.claw);
+    };
+})(m || (m = {}));
diff --git a/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts b/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts
index 316ff92c56c..f11fed6b478 100644
--- a/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts
+++ b/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts
@@ -20,3 +20,22 @@ foo(()
     => true);
 foo(()
     => { return false; });
+
+module m {
+    class City {
+        constructor(x: number, thing = ()
+            => 100) {
+        }
+
+        public m = ()
+            => 2 * 2 * 2
+    }
+
+    export enum Enum {
+        claw = (()
+            => 10)()
+    }
+
+    export var v = x
+        => new City(Enum.claw);
+}