Retain the original identifier during parse when quoted identifier is disabled

PiperOrigin-RevId: 713410853

Author: l46kok

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

@@ -690,21 +690,21 @@ private Optional<CelExpr> visitMacro(
   }
 
   private String normalizeEscapedIdent(EscapeIdentContext context) {
+    String identifier = context.getText();
     if (context instanceof SimpleIdentifierContext) {
-      return ((SimpleIdentifierContext) context).getText();
+      return identifier;
     } else if (context instanceof EscapedIdentifierContext) {
       if (!options.enableQuotedIdentifierSyntax()) {
         exprFactory.reportError(context, "unsupported syntax '`'");
-        return "";
+        return identifier;
       }
-      String escaped = ((EscapedIdentifierContext) context).getText();
-      return escaped.substring(1, escaped.length() - 1);
+      return identifier.substring(1, identifier.length() - 1);
     }
 
     // This is normally unreachable, but might happen if the parser is in an error state or if the
     // grammar is updated and not handled here.
     exprFactory.reportError(context, "unsupported identifier");
-    return "";
+    return identifier;
   }
 
   private CelExpr.CelStruct.Builder visitStructFields(FieldInitializerListContext context) {

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

@@ -296,10 +296,12 @@ public void parser_errors() {
 
     CelParser parserWithoutQuotedFields =
         CelParserImpl.newBuilder()
+            .setStandardMacros(CelStandardMacro.HAS)
             .setOptions(CelOptions.current().enableQuotedIdentifierSyntax(false).build())
             .build();
     runTest(parserWithoutQuotedFields, "foo.`bar`");
     runTest(parserWithoutQuotedFields, "Struct{`bar`: false}");
+    runTest(parserWithoutQuotedFields, "has(.`.`");
   }
 
   @Test

parser/src/test/resources/parser_errors.baseline

@@ -332,4 +332,16 @@ I: Struct{`bar`: false}
 =====>
 E: ERROR: <input>:1:8: unsupported syntax '`'
  | Struct{`bar`: false}
- | .......^
+ | .......^
+
+I: has(.`.`
+=====>
+E: ERROR: <input>:1:6: no viable alternative at input '.`.`'
+ | has(.`.`
+ | .....^
+ERROR: <input>:1:6: unsupported syntax '`'
+ | has(.`.`
+ | .....^
+ERROR: <input>:1:9: missing ')' at '<EOF>'
+ | has(.`.`
+ | ........^