use exact error message

babel · Jul 1, 2021 · 76abdb1 · 76abdb1
1 parent 36d770c
commit 76abdb1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 31 deletions.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -90,7 +90,6 @@ const TSErrors = makeErrorTemplates(
     EmptyTypeParameters: "Type parameter list cannot be empty.",
     ExpectedAmbientAfterExportDeclare:
       "'export declare' must be followed by an ambient declaration.",
-    IdentifierExpected: "Identifier expected.",
     ImportAliasHasImportType: "An import alias can not use 'import type'.",
     IncompatibleModifiers: "'%0' modifier cannot be used with '%1' modifier.",
     IndexSignatureHasAbstract:
@@ -2138,13 +2137,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
             }
           }
 
-          if (isOptionalCall) {
-            return this.raise(node.start, TSErrors.IdentifierExpected);
-          }
-
           this.unexpected();
         });
 
+        if (!result && isOptionalCall) {
+          this.unexpected(this.state.pos, tt.parenL);
+        }
+
         if (result) return result;
       }
 

diff --git a/...babel-parser/test/fixtures/typescript/type-arguments/call-optional-chain-invalid/input.ts b/...babel-parser/test/fixtures/typescript/type-arguments/call-optional-chain-invalid/input.ts
@@ -0,0 +1 @@
+f?.<string>[1];
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
@@ -0,0 +1,7 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "typescript"
+  ],
+  "throws": "Unexpected token, expected \"(\" (1:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/call-optional-chain/input.ts b/packages/babel-parser/test/fixtures/typescript/type-arguments/call-optional-chain/input.ts
@@ -2,4 +2,3 @@ f?.<Q>();
 f?.<Q, W>();
 f
 ?.<Q>();
-f?.<string>[1];
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
@@ -1,12 +1,9 @@
 {
   "type": "File",
-  "start":0,"end":49,"loc":{"start":{"line":1,"column":0},"end":{"line":5,"column":15}},
-  "errors": [
-    "SyntaxError: Identifier expected. (5:0)"
-  ],
+  "start":0,"end":33,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":8}},
   "program": {
     "type": "Program",
-    "start":0,"end":49,"loc":{"start":{"line":1,"column":0},"end":{"line":5,"column":15}},
+    "start":0,"end":33,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":8}},
     "sourceType": "module",
     "interpreter": null,
     "body": [
@@ -108,26 +105,6 @@
           },
           "optional": false
         }
-      },
-      {
-        "type": "ExpressionStatement",
-        "start":34,"end":49,"loc":{"start":{"line":5,"column":0},"end":{"line":5,"column":15}},
-        "expression": {
-          "type": "OptionalMemberExpression",
-          "start":34,"end":48,"loc":{"start":{"line":5,"column":0},"end":{"line":5,"column":14}},
-          "object": "SyntaxError: Identifier expected. (5:0)",
-          "computed": true,
-          "property": {
-            "type": "NumericLiteral",
-            "start":46,"end":47,"loc":{"start":{"line":5,"column":12},"end":{"line":5,"column":13}},
-            "extra": {
-              "rawValue": 1,
-              "raw": "1"
-            },
-            "value": 1
-          },
-          "optional": false
-        }
       }
     ],
     "directives": []