fix: Correctly set position for @(a.b)() (#17013)

fix
babel · Dec 10, 2024 · ad0f525 · ad0f525
1 parent a2d1da8
commit ad0f525
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/packages/babel-parser/src/parser/statement.ts b/packages/babel-parser/src/parser/statement.ts
@@ -771,7 +771,7 @@ export default abstract class StatementParser extends ExpressionParser {
         expr = this.wrapParenthesis(startLoc, expr);
 
         const paramsStartLoc = this.state.startLoc;
-        node.expression = this.parseMaybeDecoratorArguments(expr);
+        node.expression = this.parseMaybeDecoratorArguments(expr, startLoc);
         if (
           this.getPluginOption("decorators", "allowCallParenthesized") ===
             false &&
@@ -801,17 +801,21 @@ export default abstract class StatementParser extends ExpressionParser {
           expr = this.finishNode(node, "MemberExpression");
         }
 
-        node.expression = this.parseMaybeDecoratorArguments(expr);
+        node.expression = this.parseMaybeDecoratorArguments(expr, startLoc);
       }
     } else {
       node.expression = this.parseExprSubscripts();
     }
     return this.finishNode(node, "Decorator");
   }
 
-  parseMaybeDecoratorArguments(this: Parser, expr: N.Expression): N.Expression {
+  parseMaybeDecoratorArguments(
+    this: Parser,
+    expr: N.Expression,
+    startLoc: Position,
+  ): N.Expression {
     if (this.eat(tt.parenL)) {
-      const node = this.startNodeAtNode<N.CallExpression>(expr);
+      const node = this.startNodeAt<N.CallExpression>(startLoc);
       node.callee = expr;
       node.arguments = this.parseCallExpressionArguments(tt.parenR);
       this.toReferencedList(node.arguments);

diff --git a/packages/babel-parser/src/plugins/typescript/index.ts b/packages/babel-parser/src/plugins/typescript/index.ts
@@ -3756,14 +3756,18 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
       return super.parseBindingAtom();
     }
 
-    parseMaybeDecoratorArguments(expr: N.Expression): N.Expression {
+    parseMaybeDecoratorArguments(
+      expr: N.Expression,
+      startLoc: Position,
+    ): N.Expression {
       // handles `@f<<T>`
       if (this.match(tt.lt) || this.match(tt.bitShiftL)) {
         const typeArguments = this.tsParseTypeArgumentsInExpression();
 
         if (this.match(tt.parenL)) {
           const call = super.parseMaybeDecoratorArguments(
             expr,
+            startLoc,
           ) as N.CallExpression;
           call.typeParameters = typeArguments;
           return call;
@@ -3772,7 +3776,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
         this.unexpected(null, tt.parenL);
       }
 
-      return super.parseMaybeDecoratorArguments(expr);
+      return super.parseMaybeDecoratorArguments(expr, startLoc);
     }
 
     checkCommaAfterRest(

diff --git a/...es/experimental/decorators/parenthesized-allowCallParenthesized-false-invalid/output.json b/...es/experimental/decorators/parenthesized-allowCallParenthesized-false-invalid/output.json
@@ -32,7 +32,7 @@
                   "start":14,"end":30,"loc":{"start":{"line":2,"column":2,"index":14},"end":{"line":2,"column":18,"index":30}},
                   "expression": {
                     "type": "CallExpression",
-                    "start":16,"end":30,"loc":{"start":{"line":2,"column":4,"index":16},"end":{"line":2,"column":18,"index":30}},
+                    "start":15,"end":30,"loc":{"start":{"line":2,"column":3,"index":15},"end":{"line":2,"column":18,"index":30}},
                     "callee": {
                       "type": "MemberExpression",
                       "start":16,"end":24,"loc":{"start":{"line":2,"column":4,"index":16},"end":{"line":2,"column":12,"index":24}},

diff --git a/...st/fixtures/experimental/decorators/parenthesized-allowCallParenthesized-true/output.json b/...st/fixtures/experimental/decorators/parenthesized-allowCallParenthesized-true/output.json
@@ -29,7 +29,7 @@
                   "start":14,"end":30,"loc":{"start":{"line":2,"column":2,"index":14},"end":{"line":2,"column":18,"index":30}},
                   "expression": {
                     "type": "CallExpression",
-                    "start":16,"end":30,"loc":{"start":{"line":2,"column":4,"index":16},"end":{"line":2,"column":18,"index":30}},
+                    "start":15,"end":30,"loc":{"start":{"line":2,"column":3,"index":15},"end":{"line":2,"column":18,"index":30}},
                     "callee": {
                       "type": "MemberExpression",
                       "start":16,"end":24,"loc":{"start":{"line":2,"column":4,"index":16},"end":{"line":2,"column":12,"index":24}},

diff --git a/packages/babel-parser/test/fixtures/experimental/decorators/parenthesized/output.json b/packages/babel-parser/test/fixtures/experimental/decorators/parenthesized/output.json
@@ -153,7 +153,7 @@
                   "start":93,"end":109,"loc":{"start":{"line":7,"column":2,"index":93},"end":{"line":7,"column":18,"index":109}},
                   "expression": {
                     "type": "CallExpression",
-                    "start":95,"end":109,"loc":{"start":{"line":7,"column":4,"index":95},"end":{"line":7,"column":18,"index":109}},
+                    "start":94,"end":109,"loc":{"start":{"line":7,"column":3,"index":94},"end":{"line":7,"column":18,"index":109}},
                     "callee": {
                       "type": "MemberExpression",
                       "start":95,"end":103,"loc":{"start":{"line":7,"column":4,"index":95},"end":{"line":7,"column":12,"index":103}},