refactor: simplify estree overwritten checkDuplicateProto

babel · May 31, 2020 · 3a85c92 · 3a85c92
1 parent f534262
commit 3a85c92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
@@ -85,8 +85,8 @@ export default class ExpressionParser extends LValParser {
   ): void {
     if (
       prop.type === "SpreadElement" ||
+      prop.type === "ObjectMethod" ||
       prop.computed ||
-      prop.kind ||
       // $FlowIgnore
       prop.shorthand
     ) {

diff --git a/packages/babel-parser/src/plugins/estree.js b/packages/babel-parser/src/plugins/estree.js
@@ -148,32 +148,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       protoRef: { used: boolean },
       refExpressionErrors: ?ExpressionErrors,
     ): void {
-      if (
-        prop.type === "SpreadElement" ||
-        prop.computed ||
-        prop.method ||
-        // $FlowIgnore
-        prop.shorthand
-      ) {
+      // $FlowIgnore: check prop.method and fallback to super method
+      if (prop.method) {
         return;
       }
-
-      const key = prop.key;
-      // It is either an Identifier or a String/NumericLiteral
-      const name = key.type === "Identifier" ? key.name : String(key.value);
-
-      if (name === "__proto__" && prop.kind === "init") {
-        // Store the first redefinition's position
-        if (protoRef.used) {
-          if (refExpressionErrors?.doubleProto === -1) {
-            refExpressionErrors.doubleProto = key.start;
-          } else {
-            this.raise(key.start, Errors.DuplicateProto);
-          }
-        }
-
-        protoRef.used = true;
-      }
+      super.checkDuplicatedProto(prop, protoRef, refExpressionErrors);
     }
 
     isValidDirective(stmt: N.Statement): boolean {