Merge pull request #481 from oridag:parse-macro-receiver

PiperOrigin-RevId: 697056475

Author: copybara-github

parser/src/main/java/dev/cel/parser/Parser.java

@@ -613,6 +613,7 @@ private CelExpr buildMacroCallArgs(CelExpr expr) {
       // means that the depth check on the AST during parsing will catch recursion overflows
       // before we get to here.
       expr.call().args().forEach(arg -> callExpr.addArgs(buildMacroCallArgs(arg)));
+      expr.call().target().ifPresent(target -> callExpr.setTarget(buildMacroCallArgs(target)));
       return resultExpr.setCall(callExpr.build()).build();
     }
     return expr;

parser/src/test/java/dev/cel/parser/CelUnparserImplTest.java

@@ -273,4 +273,18 @@ public void unparse_comprehensionWithoutMacroCallTracking_throwsException() thro
             "Comprehension unparsing requires macro calls to be populated. Ensure the option is"
                 + " enabled.");
   }
+
+  @Test
+  public void unparse_macroWithReceiverStyleArg() throws Exception {
+    CelParser parser =
+        CelParserImpl.newBuilder()
+            .setOptions(CelOptions.newBuilder().populateMacroCalls(true).build())
+            .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
+            .build();
+    CelAbstractSyntaxTree ast =
+        parser.parse("[\"a\"].all(x, x.trim().lowerAscii().contains(\"b\"))").getAst();
+
+    assertThat(unparser.unparse(ast))
+        .isEqualTo("[\"a\"].all(x, x.trim().lowerAscii().contains(\"b\"))");
+  }
 }