use exact error message

babel · Jul 7, 2021 · dac5990 · dac5990
1 parent adedffd
commit dac5990
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -2077,7 +2077,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         this.match(tt.questionDot) &&
         this.lookaheadCharCode() === charCodes.lessThan
       ) {
-        isOptionalCall = true;
+        state.optionalChainMember = isOptionalCall = true;
         if (noCalls) {
           state.stop = true;
           return base;
@@ -2086,6 +2086,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       }
 
       if (this.isRelational("<")) {
+        let error;
         // tsTryParseAndCatch is expensive, so avoid if not necessary.
         // There are number of things we are going to "maybe" parse, like type arguments on
         // tagged template expressions. If any of them fail, walk it back and continue.
@@ -2108,6 +2109,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           const typeArguments = this.tsParseTypeArguments();
 
           if (typeArguments) {
+            if (isOptionalCall && !this.match(tt.parenL)) {
+              error = [this.state.pos, tt.parenL];
+              this.unexpected();
+            }
+
             if (!noCalls && this.eat(tt.parenL)) {
               // possibleAsync always false here, because we would have handled it above.
               // $FlowIgnore (won't be any undefined arguments)
@@ -2128,10 +2134,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
                 node.optional = true;
               }
 
-              return this.finishCallExpression(
-                node,
-                state.optionalChainMember || isOptionalCall,
-              );
+              return this.finishCallExpression(node, state.optionalChainMember);
             } else if (this.match(tt.backQuote)) {
               const result = this.parseTaggedTemplateExpression(
                 base,
@@ -2147,8 +2150,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           this.unexpected();
         });
 
-        if (!result && isOptionalCall) {
-          this.unexpected(this.state.pos, tt.parenL);
+        if (error) {
+          this.unexpected(...error);
         }
 
         if (result) return result;

diff --git a/...l-parser/test/fixtures/typescript/type-arguments/call-optional-chain-invalid/options.json b/...l-parser/test/fixtures/typescript/type-arguments/call-optional-chain-invalid/options.json
@@ -3,5 +3,5 @@
   "plugins": [
     "typescript"
   ],
-  "throws": "Unexpected token, expected \"(\" (1:4)"
+  "throws": "Unexpected token, expected \"(\" (1:12)"
 }
diff --git a/...ages/babel-parser/test/fixtures/typescript/type-arguments/call-optional-chain/output.json b/...ages/babel-parser/test/fixtures/typescript/type-arguments/call-optional-chain/output.json
@@ -11,7 +11,7 @@
         "type": "ExpressionStatement",
         "start":0,"end":9,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":9}},
         "expression": {
-          "type": "CallExpression",
+          "type": "OptionalCallExpression",
           "start":0,"end":8,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":8}},
           "callee": {
             "type": "Identifier",
@@ -41,7 +41,7 @@
         "type": "ExpressionStatement",
         "start":10,"end":22,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":12}},
         "expression": {
-          "type": "CallExpression",
+          "type": "OptionalCallExpression",
           "start":10,"end":21,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":11}},
           "callee": {
             "type": "Identifier",
@@ -80,7 +80,7 @@
         "type": "ExpressionStatement",
         "start":23,"end":33,"loc":{"start":{"line":3,"column":0},"end":{"line":4,"column":8}},
         "expression": {
-          "type": "CallExpression",
+          "type": "OptionalCallExpression",
           "start":23,"end":32,"loc":{"start":{"line":3,"column":0},"end":{"line":4,"column":7}},
           "callee": {
             "type": "Identifier",