Address review

babel · Aug 18, 2021 · d743bc8 · d743bc8
1 parent 019561b
commit d743bc8
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 22 deletions.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -230,17 +230,22 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     /** Parses a modifier matching one the given modifier names. */
-    tsParseModifier<T: TsModifier>(allowedModifiers: T[]): ?T {
+    tsParseModifier<T: TsModifier>(
+      allowedModifiers: T[],
+      stopOnStartOfClassStaticBlock?: boolean,
+    ): ?T {
       if (!this.match(tt.name)) {
         return undefined;
       }
 
       const modifier = this.state.value;
-      if (
-        allowedModifiers.indexOf(modifier) !== -1 &&
-        this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this))
-      ) {
-        return modifier;
+      if (allowedModifiers.indexOf(modifier) !== -1) {
+        if (stopOnStartOfClassStaticBlock && this.tsIsStartOfStaticBlocks()) {
+          return undefined;
+        }
+        if (this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this))) {
+          return modifier;
+        }
       }
       return undefined;
     }
@@ -258,6 +263,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       allowedModifiers: TsModifier[],
       disallowedModifiers?: TsModifier[],
       errorTemplate?: ErrorTemplate,
+      stopOnStartOfClassStaticBlock?: boolean,
     ): void {
       const enforceOrder = (pos, modifier, before, after) => {
         if (modifier === before && modified[after]) {
@@ -277,6 +283,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         const startPos = this.state.start;
         const modifier: ?TsModifier = this.tsParseModifier(
           allowedModifiers.concat(disallowedModifiers ?? []),
+          stopOnStartOfClassStaticBlock,
         );
 
         if (!modifier) break;
@@ -2374,6 +2381,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       });
     }
 
+    tsIsStartOfStaticBlocks() {
+      return (
+        this.isContextual("static") &&
+        this.lookaheadCharCode() === charCodes.leftCurlyBrace
+      );
+    }
+
     parseClassMember(
       classBody: N.ClassBody,
       member: any,
@@ -2391,18 +2405,26 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       this.tsParseModifiers(
         member,
         invalidModifersForStaticBlocks.concat(["static"]),
+        /* disallowedModifiers */ undefined,
+        /* errorTemplate */ undefined,
+        /* stopOnStartOfClassStaticBlock */ true,
       );
 
       const callParseClassMemberWithIsStatic = () => {
-        const isStatic = !!member.static;
-        if (isStatic && this.eat(tt.braceL)) {
-          delete member.static;
+        if (this.tsIsStartOfStaticBlocks()) {
+          this.next(); // eat "static"
+          this.next(); // eat "{"
           if (this.tsHasSomeModifiers(member, invalidModifersForStaticBlocks)) {
             this.raise(this.state.pos, TSErrors.StaticBlockCannotHaveModifier);
           }
           this.parseClassStaticBlock(classBody, ((member: any): N.StaticBlock));
         } else {
-          this.parseClassMemberWithIsStatic(classBody, member, state, isStatic);
+          this.parseClassMemberWithIsStatic(
+            classBody,
+            member,
+            state,
+            !!member.static,
+          );
         }
       };
       if (member.declare) {

diff --git a/...ixtures/typescript/static-blocks/invalid-static-block-with-accessibility-private/input.ts b/...ixtures/typescript/static-blocks/invalid-static-block-with-accessibility-private/input.ts
@@ -1,3 +1,3 @@
 class Foo {
-  static private {}
+  private static {}
 }
diff --git a/...ures/typescript/static-blocks/invalid-static-block-with-accessibility-private/output.json b/...ures/typescript/static-blocks/invalid-static-block-with-accessibility-private/output.json
@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":33,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'private' modifier must precede 'static' modifier. (2:9)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:19)"
   ],
   "program": {

diff --git a/...tures/typescript/static-blocks/invalid-static-block-with-accessibility-protected/input.ts b/...tures/typescript/static-blocks/invalid-static-block-with-accessibility-protected/input.ts
@@ -1,3 +1,3 @@
 class Foo {
-  static protected {}
+  protected static {}
 }
diff --git a/...es/typescript/static-blocks/invalid-static-block-with-accessibility-protected/output.json b/...es/typescript/static-blocks/invalid-static-block-with-accessibility-protected/output.json
@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":35,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'protected' modifier must precede 'static' modifier. (2:9)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:21)"
   ],
   "program": {

diff --git a/...fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-public/input.ts b/...fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-public/input.ts
@@ -1,3 +1,3 @@
 class Foo {
-  static public {}
+  public static {}
 }
diff --git a/...tures/typescript/static-blocks/invalid-static-block-with-accessibility-public/output.json b/...tures/typescript/static-blocks/invalid-static-block-with-accessibility-public/output.json
@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":32,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'public' modifier must precede 'static' modifier. (2:9)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:18)"
   ],
   "program": {

diff --git a/...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-abstract/output.json b/...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-abstract/output.json
@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'static' modifier cannot be used with 'abstract' modifier. (2:11)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:20)"
   ],
   "program": {

diff --git a/...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override/output.json b/...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override/output.json
@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'static' modifier must precede 'override' modifier. (2:11)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:20)"
   ],
   "program": {

diff --git a/...t/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-static/output.json b/...t/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-static/output.json
@@ -1,9 +1,6 @@
 {
   "type": "File",
   "start":0,"end":32,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
-  "errors": [
-    "SyntaxError: Duplicate modifier: 'static'. (2:9)"
-  ],
   "program": {
     "type": "Program",
     "start":0,"end":32,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
@@ -26,6 +23,7 @@
             {
               "type": "StaticBlock",
               "start":14,"end":30,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":18}},
+              "static": true,
               "body": []
             }
           ]

diff --git a/...ixtures/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly/output.json b/...ixtures/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly/output.json
@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'static' modifier must precede 'readonly' modifier. (2:11)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:20)"
   ],
   "program": {