Use callback

babel · Feb 9, 2021 · ededec2 · ededec2
1 parent 6739d43
commit ededec2
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -210,7 +210,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         accessibility?: N.Accessibility,
       },
       allowedModifiers: TsModifier[],
-      disallowedModifiers?: TsModifier[],
+      callback?: (startPos: number, modifer: TsModifier) => void,
     ): void {
       for (;;) {
         const startPos = this.state.start;
@@ -231,8 +231,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           modified[modifier] = true;
         }
 
-        if (disallowedModifiers && disallowedModifiers.includes(modifier)) {
-          this.raise(startPos, TSErrors.InvalidModifierOnTypeMember, modifier);
+        if (callback) {
+          callback(startPos, modifier);
         }
       }
     }
@@ -584,6 +584,14 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         }
       }
 
+      const denyModifiers = [
+        "declare",
+        "abstract",
+        "private",
+        "protected",
+        "public",
+        "static",
+      ];
       this.tsParseModifiers(
         node,
         [
@@ -595,7 +603,15 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           "public",
           "static",
         ],
-        ["declare", "abstract", "private", "protected", "public", "static"],
+        (startPos, modifier) => {
+          if (denyModifiers.includes(modifier)) {
+            this.raise(
+              startPos,
+              TSErrors.InvalidModifierOnTypeMember,
+              modifier,
+            );
+          }
+        },
       );
 
       const idx = this.tsTryParseIndexSignature(node);