Avoid ASI between "get"/"set" and method name (#157)

babel · Oct 5, 2016 · ca66f6b · ca66f6b
1 parent 680f35f
commit ca66f6b
Show file tree

Hide file tree

Showing 4 changed files with 161 additions and 5 deletions.
diff --git a/src/parser/statement.js b/src/parser/statement.js
@@ -618,8 +618,12 @@ pp.parseClass = function (node, isStatement, optionalId) {
   return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression");
 };
 
-pp.isClassProperty = function () {
-  return this.match(tt.eq) || this.isLineTerminator();
+pp.isInitializedClassProperty = function () {
+  return this.match(tt.eq);
+};
+
+pp.isUninitializedClassProperty = function () {
+  return this.isLineTerminator();
 };
 
 pp.isClassMutatorStarter = function () {
@@ -674,7 +678,7 @@ pp.parseClassBody = function (node) {
     }
 
     if (!isGenerator) {
-      if (this.isClassProperty()) {
+      if (this.isInitializedClassProperty() || (this.isUninitializedClassProperty() && method.key.name !== "get" && method.key.name !== "set")) {
         classBody.body.push(this.parseClassProperty(method));
         continue;
       }

diff --git a/src/plugins/flow.js b/src/plugins/flow.js
@@ -976,8 +976,15 @@ export default function (instance) {
     };
   });
 
-  // determine whether or not we're currently in the position where a class property would appear
-  instance.extend("isClassProperty", function (inner) {
+  // determine whether or not we're currently in the position where an initialized class property would appear
+  instance.extend("isInitializedClassProperty", function (inner) {
+    return function () {
+      return this.match(tt.colon) || inner.call(this);
+    };
+  });
+
+  // determine whether or not we're currently in the position where an uninitialized class property would appear
+  instance.extend("isUninitializedClassProperty", function (inner) {
     return function () {
       return this.match(tt.colon) || inner.call(this);
     };

diff --git a/test/fixtures/core/regression/157/actual.js b/test/fixtures/core/regression/157/actual.js
@@ -0,0 +1,4 @@
+class A {
+  get
+    x(){}
+}
diff --git a/test/fixtures/core/regression/157/expected.json b/test/fixtures/core/regression/157/expected.json
@@ -0,0 +1,141 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 27,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 27,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 27,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 6,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 8,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 8
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ClassMethod",
+              "start": 12,
+              "end": 25,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 3,
+                  "column": 9
+                }
+              },
+              "computed": false,
+              "key": {
+                "type": "Identifier",
+                "start": 20,
+                "end": 21,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 5
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "static": false,
+              "kind": "get",
+              "id": null,
+              "generator": false,
+              "expression": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 23,
+                "end": 25,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 9
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}