Merge pull request #648 from Qantas94Heavy/private-field-no-shorthand

Remove private field shorthand
babel · Jul 27, 2017 · 6821cfb · 6821cfb
2 parents 0bc9d78 + 42d5dbe
commit 6821cfb
Show file tree

Hide file tree

Showing 12 changed files with 2,623 additions and 1,952 deletions.
diff --git a/src/parser/expression.js b/src/parser/expression.js
@@ -331,14 +331,12 @@ export default class ExpressionParser extends LValParser {
 
         if (arg.type === "Identifier") {
           this.raise(node.start, "Deleting local variable in strict mode");
-        } else if (this.hasPlugin("classPrivateProperties")) {
-          if (
-            arg.type === "PrivateName" ||
-            (arg.type === "MemberExpression" &&
-              arg.property.type === "PrivateName")
-          ) {
-            this.raise(node.start, "Deleting a private field is not allowed");
-          }
+        } else if (
+          this.hasPlugin("classPrivateProperties") &&
+          arg.type === "MemberExpression" &&
+          arg.property.type === "PrivateName"
+        ) {
+          this.raise(node.start, "Deleting a private field is not allowed");
         }
       }
 
@@ -747,13 +745,6 @@ export default class ExpressionParser extends LValParser {
         this.takeDecorators(node);
         return this.parseClass(node, false);
 
-      case tt.hash:
-        if (this.hasPlugin("classPrivateProperties")) {
-          return this.parseMaybePrivateName();
-        } else {
-          throw this.unexpected();
-        }
-
       case tt._new:
         return this.parseNew();
 

diff --git a/src/parser/lval.js b/src/parser/lval.js
@@ -49,7 +49,6 @@ export default class LValParser extends NodeUtils {
     if (node) {
       switch (node.type) {
         case "Identifier":
-        case "PrivateName":
         case "ObjectPattern":
         case "ArrayPattern":
         case "AssignmentPattern":
@@ -300,7 +299,6 @@ export default class LValParser extends NodeUtils {
     contextDescription: string,
   ): void {
     switch (expr.type) {
-      case "PrivateName":
       case "Identifier":
         this.checkReservedWord(expr.name, expr.start, false, true);
 

diff --git a/test/fixtures/experimental/class-private-properties/asi-failure-generator/options.json b/test/fixtures/experimental/class-private-properties/asi-failure-generator/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "Unexpected token, expected ; (3:9)",
+  "throws": "Unexpected token (3:3)",
   "plugins": ["classProperties", "classPrivateProperties"]
 }
diff --git a/test/fixtures/experimental/class-private-properties/delete-non-private/actual.js b/test/fixtures/experimental/class-private-properties/delete-non-private/actual.js
diff --git a/test/fixtures/experimental/class-private-properties/delete-non-private/expected.json b/test/fixtures/experimental/class-private-properties/delete-non-private/expected.json
diff --git a/test/fixtures/experimental/class-private-properties/delete-non-private/options.json b/test/fixtures/experimental/class-private-properties/delete-non-private/options.json
diff --git a/...erties/failure-delete-shorthand/actual.js → ...te-properties/failure-shorthand/actual.js b/...erties/failure-delete-shorthand/actual.js → ...te-properties/failure-shorthand/actual.js
diff --git a/...ies/failure-delete-shorthand/options.json → ...properties/failure-shorthand/options.json b/...ies/failure-delete-shorthand/options.json → ...properties/failure-shorthand/options.json
@@ -1,5 +1,5 @@
 {
-  "throws": "Deleting a private field is not allowed (4:4)",
+  "throws": "Unexpected token (4:11)",
   "plugins": [
     "classProperties",
     "classPrivateProperties"