Automated rollback of commit 6d2f6fc.

PiperOrigin-RevId: 731383560

Author: protobuf-github-bot

java/core/src/main/java/com/google/protobuf/TextFormat.java

@@ -38,6 +38,8 @@ private TextFormat() {}
 
   private static final Logger logger = Logger.getLogger(TextFormat.class.getName());
 
+  private static final String DEBUG_STRING_SILENT_MARKER = " \t ";
+
   private static final String REDACTED_MARKER = "[REDACTED]";
 
   /**
@@ -998,6 +1000,15 @@ private static final class Tokenizer {
     private int previousLine = 0;
     private int previousColumn = 0;
 
+    /**
+     * {@link containsSilentMarkerAfterCurrentToken} indicates if there is a silent marker after the
+     * current token. This value is moved to {@link containsSilentMarkerAfterPrevToken} every time
+     * the next token is parsed.
+     */
+    private boolean containsSilentMarkerAfterCurrentToken = false;
+
+    private boolean containsSilentMarkerAfterPrevToken = false;
+
     /** Construct a tokenizer that parses tokens from the given text. */
     private Tokenizer(final CharSequence text) {
       this.text = text;
@@ -1021,6 +1032,14 @@ int getColumn() {
       return column;
     }
 
+    boolean getContainsSilentMarkerAfterCurrentToken() {
+      return containsSilentMarkerAfterCurrentToken;
+    }
+
+    boolean getContainsSilentMarkerAfterPrevToken() {
+      return containsSilentMarkerAfterPrevToken;
+    }
+
     /** Are we at the end of the input? */
     boolean atEnd() {
       return currentToken.length() == 0;
@@ -1709,6 +1728,19 @@ public static <T extends Message> T parse(
    * control the parser behavior.
    */
   public static class Parser {
+
+    /**
+     * A valid silent marker appears between a field name and its value. If there is a ":" in
+     * between, the silent marker will only appear after the colon. This is called after a field
+     * name is parsed, and before the ":" if it exists. If the current token is ":", then
+     * containsSilentMarkerAfterCurrentToken indicates if there is a valid silent marker. Otherwise,
+     * the current token is part of the field value, so the silent marker is indicated by
+     * containsSilentMarkerAfterPrevToken.
+     */
+    private void detectSilentMarker(
+        Tokenizer tokenizer, Descriptor immediateMessageType, String fieldName) {
+    }
+
     /**
      * Determines if repeated values for non-repeated fields and oneofs are permitted. For example,
      * given required/optional field "foo" and a oneof containing "baz" and "moo":
@@ -2081,12 +2113,14 @@ private void mergeField(
 
       // Skips unknown fields.
       if (field == null) {
+        detectSilentMarker(tokenizer, type, name);
         guessFieldTypeAndSkip(tokenizer, type, recursionLimit);
         return;
       }
 
       // Handle potential ':'.
       if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
+        detectSilentMarker(tokenizer, type, field.getFullName());
         tokenizer.tryConsume(":"); // optional
         if (parseTreeBuilder != null) {
           TextFormatParseInfoTree.Builder childParseTreeBuilder =
@@ -2112,6 +2146,7 @@ private void mergeField(
               recursionLimit);
         }
       } else {
+        detectSilentMarker(tokenizer, type, field.getFullName());
         tokenizer.consume(":"); // required
         consumeFieldValues(
             tokenizer,
@@ -2135,26 +2170,26 @@ private void mergeField(
       }
     }
 
-    private void consumeFullTypeName(Tokenizer tokenizer) throws ParseException {
+    private String consumeFullTypeName(Tokenizer tokenizer) throws ParseException {
       // If there is not a leading `[`, this is just a type name.
       if (!tokenizer.tryConsume("[")) {
-        tokenizer.consumeIdentifier();
-        return;
+        return tokenizer.consumeIdentifier();
       }
 
       // Otherwise, this is an extension or google.protobuf.Any type URL: we consume proto path
       // elements until we've addressed the type.
-      tokenizer.consumeIdentifier();
+      String name = tokenizer.consumeIdentifier();
       while (tokenizer.tryConsume(".")) {
-        tokenizer.consumeIdentifier();
+        name += "." + tokenizer.consumeIdentifier();
       }
       if (tokenizer.tryConsume("/")) {
-        tokenizer.consumeIdentifier();
+        name += "/" + tokenizer.consumeIdentifier();
         while (tokenizer.tryConsume(".")) {
-          tokenizer.consumeIdentifier();
+          name += "." + tokenizer.consumeIdentifier();
         }
       }
       tokenizer.consume("]");
+      return name;
     }
 
     /**
@@ -2400,6 +2435,7 @@ private void mergeAnyFieldValue(
           throw tokenizer.parseExceptionPreviousToken("Expected a valid type URL.");
         }
       }
+      detectSilentMarker(tokenizer, anyDescriptor, typeUrlBuilder.toString());
       tokenizer.tryConsume(":");
       final String anyEndToken;
       if (tokenizer.tryConsume("<")) {
@@ -2444,7 +2480,8 @@ private void mergeAnyFieldValue(
     /** Skips the next field including the field's name and value. */
     private void skipField(Tokenizer tokenizer, Descriptor type, int recursionLimit)
         throws ParseException {
-      consumeFullTypeName(tokenizer);
+      String name = consumeFullTypeName(tokenizer);
+      detectSilentMarker(tokenizer, type, name);
       guessFieldTypeAndSkip(tokenizer, type, recursionLimit);
 
       // For historical reasons, fields may optionally be separated by commas or