Split up the string "M" + "OE:(begin|end)_intracomment_stripping," as the full string will trigger stripping under Copybara.

Also, avoid reference to an internal link shortener, as we are making references to it an error.

Looking to the future:

When we migrate to use proper Copybara stripping directives, we could consider removing support for the old directives. Then the problem would mostly go away. However, we might end up having the same problem with Copybara directives when google-java-format's strings and method names start mentioning *them*.

PiperOrigin-RevId: 311344956

Author: cpovirk

core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java

@@ -507,9 +507,9 @@ private static boolean hasMultipleNewlines(String s) {
   // Match "@param <T>" specially in case the <T> is a <P> or other HTML tag we treat specially.
   private static final Pattern FOOTER_TAG_PATTERN = compile("^@(param\\s+<\\w+>|[a-z]\\w*)");
   private static final Pattern MOE_BEGIN_STRIP_COMMENT_PATTERN =
-      compile("^<!--\\s*MOE:begin_intracomment_strip\\s*-->");
+      compile("^<!--\\s*M" + "OE:begin_intracomment_strip\\s*-->");
   private static final Pattern MOE_END_STRIP_COMMENT_PATTERN =
-      compile("^<!--\\s*MOE:end_intracomment_strip\\s*-->");
+      compile("^<!--\\s*M" + "OE:end_intracomment_strip\\s*-->");
   private static final Pattern HTML_COMMENT_PATTERN = fullCommentPattern();
   private static final Pattern PRE_OPEN_PATTERN = openTagPattern("pre");
   private static final Pattern PRE_CLOSE_PATTERN = closeTagPattern("pre");

core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java

@@ -115,48 +115,48 @@ public void moeComments() {
     String[] input = {
       "/**",
       " * Deatomizes the given user.",
-      " * <!-- MOE:begin_intracomment_strip -->",
-      " * See go/deatomizer-v5 for the design doc.",
-      " * <!-- MOE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:begin_intracomment_strip -->",
+      " * See deatomizer-v5 for the design doc.",
+      " * <!-- M" + "OE:end_intracomment_strip -->",
       " * To reatomize, call {@link reatomize}.",
       " *",
-      " * <!-- MOE:begin_intracomment_strip -->",
+      " * <!-- M" + "OE:begin_intracomment_strip -->",
       " * <p>This method is used in the Google teleporter.",
       " *",
       " * <p>Yes, we have a teleporter.",
-      " * <!-- MOE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:end_intracomment_strip -->",
       " *",
       " * @param user the person to teleport.",
-      " *     <!-- MOE:begin_intracomment_strip -->",
-      " *     Users must sign go/deatomize-waiver ahead of time.",
-      " *     <!-- MOE:end_intracomment_strip -->",
-      " * <!-- MOE:begin_intracomment_strip -->",
+      " *     <!-- M" + "OE:begin_intracomment_strip -->",
+      " *     Users must sign deatomize-waiver ahead of time.",
+      " *     <!-- M" + "OE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:begin_intracomment_strip -->",
       " * @deprecated Sometimes turns the user into a goat.",
-      " * <!-- MOE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:end_intracomment_strip -->",
       " */",
       "class Test {}",
     };
     String[] expected = {
       "/**",
       " * Deatomizes the given user.",
-      " * <!-- MOE:begin_intracomment_strip -->",
-      " * See go/deatomizer-v5 for the design doc.",
-      " * <!-- MOE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:begin_intracomment_strip -->",
+      " * See deatomizer-v5 for the design doc.",
+      " * <!-- M" + "OE:end_intracomment_strip -->",
       " * To reatomize, call {@link reatomize}.",
       " *",
-      " * <!-- MOE:begin_intracomment_strip -->",
+      " * <!-- M" + "OE:begin_intracomment_strip -->",
       " * <p>This method is used in the Google teleporter.",
       " *",
       " * <p>Yes, we have a teleporter.",
-      " * <!-- MOE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:end_intracomment_strip -->",
       " *",
       " * @param user the person to teleport.",
-      " *     <!-- MOE:begin_intracomment_strip -->",
-      " *     Users must sign go/deatomize-waiver ahead of time.",
-      " *     <!-- MOE:end_intracomment_strip -->",
-      " * <!-- MOE:begin_intracomment_strip -->",
+      " *     <!-- M" + "OE:begin_intracomment_strip -->",
+      " *     Users must sign deatomize-waiver ahead of time.",
+      " *     <!-- M" + "OE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:begin_intracomment_strip -->",
       " * @deprecated Sometimes turns the user into a goat.",
-      " * <!-- MOE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:end_intracomment_strip -->",
       " */",
       "class Test {}",
     };
@@ -169,15 +169,15 @@ public void moeCommentBeginOnlyInMiddleOfDoc() {
     String[] input = {
       "/**", //
       " * Foo.",
-      " * <!-- MOE:begin_intracomment_strip -->",
+      " * <!-- M" + "OE:begin_intracomment_strip -->",
       " * Bar.",
       " */",
       "class Test {}",
     };
     String[] expected = {
       "/**", //
       " * Foo.",
-      " * <!-- MOE:begin_intracomment_strip -->",
+      " * <!-- M" + "OE:begin_intracomment_strip -->",
       " * Bar.",
       " */",
       "class Test {}",
@@ -192,7 +192,7 @@ public void moeCommentBeginOnlyAtEndOfDoc() {
     String[] input = {
       "/**", //
       " * Foo.",
-      " * <!-- MOE:begin_intracomment_strip -->",
+      " * <!-- M" + "OE:begin_intracomment_strip -->",
       " */",
       "class Test {}",
     };
@@ -209,14 +209,14 @@ public void moeCommentEndOnly() {
     String[] input = {
       "/**", //
       " * Foo.",
-      " * <!-- MOE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:end_intracomment_strip -->",
       " */",
       "class Test {}",
     };
     String[] expected = {
       "/**", //
       " * Foo.",
-      " * <!-- MOE:end_intracomment_strip -->",
+      " * <!-- M" + "OE:end_intracomment_strip -->",
       " */",
       "class Test {}",
     };