Address review1

babel · Jun 9, 2021 · d710f34 · d710f34
1 parent 18216ed
commit d710f34
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -1932,15 +1932,18 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         accessibility = this.parseAccessModifier();
         override = !!this.tsParseModifier(["override"]);
         readonly = !!this.tsParseModifier(["readonly"]);
-        if (allowModifiers === false && (accessibility || readonly)) {
+        if (
+          allowModifiers === false &&
+          (accessibility || readonly || override)
+        ) {
           this.raise(startPos, TSErrors.UnexpectedParameterModifier);
         }
       }
 
       const left = this.parseMaybeDefault();
       this.parseAssignableListItemTypes(left);
       const elt = this.parseMaybeDefault(left.start, left.loc.start, left);
-      if (accessibility || readonly) {
+      if (accessibility || readonly || override) {
         const pp: N.TSParameterProperty = this.startNodeAt(startPos, startLoc);
         if (decorators.length) {
           pp.decorators = decorators;

diff --git a/...parser/test/fixtures/typescript/class/constructor-with-override-modifer-names/output.json b/...parser/test/fixtures/typescript/class/constructor-with-override-modifer-names/output.json
@@ -40,15 +40,20 @@
               "async": false,
               "params": [
                 {
-                  "type": "Identifier",
-                  "start":43,"end":54,"loc":{"start":{"line":2,"column":23},"end":{"line":2,"column":34},"identifierName":"foo"},
-                  "name": "foo",
-                  "typeAnnotation": {
-                    "type": "TSTypeAnnotation",
-                    "start":46,"end":54,"loc":{"start":{"line":2,"column":26},"end":{"line":2,"column":34}},
+                  "type": "TSParameterProperty",
+                  "start":34,"end":54,"loc":{"start":{"line":2,"column":14},"end":{"line":2,"column":34}},
+                  "override": true,
+                  "parameter": {
+                    "type": "Identifier",
+                    "start":43,"end":54,"loc":{"start":{"line":2,"column":23},"end":{"line":2,"column":34},"identifierName":"foo"},
+                    "name": "foo",
                     "typeAnnotation": {
-                      "type": "TSStringKeyword",
-                      "start":48,"end":54,"loc":{"start":{"line":2,"column":28},"end":{"line":2,"column":34}}
+                      "type": "TSTypeAnnotation",
+                      "start":46,"end":54,"loc":{"start":{"line":2,"column":26},"end":{"line":2,"column":34}},
+                      "typeAnnotation": {
+                        "type": "TSStringKeyword",
+                        "start":48,"end":54,"loc":{"start":{"line":2,"column":28},"end":{"line":2,"column":34}}
+                      }
                     }
                   }
                 }