Always break between leading comments and opening delimiters of text …

…blocks PiperOrigin-RevId: 694541639
google · Nov 8, 2024 · 0a60c5f · 0a60c5f
1 parent 98c6bbd
commit 0a60c5f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/Input.java b/core/src/main/java/com/google/googlejavaformat/Input.java
@@ -71,6 +71,11 @@ public interface Tok {
 
     /** Is the {@code Tok} a comment? */
     boolean isComment();
+
+    /** Is the {@code Tok} a text block? */
+    default boolean isTextBlock() {
+      return false;
+    }
   }
 
   /** A {@code Token} is a language-level token. */

diff --git a/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java b/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java
@@ -534,7 +534,7 @@ public final ImmutableList<Op> build() {
               space = tokBefore.isSlashStarComment();
               newlines = 0;
               lastWasComment = true;
-              if (tokBefore.isJavadocComment()) {
+              if (tokBefore.isJavadocComment() || token.getTok().isTextBlock()) {
                 tokOps.put(j, Doc.Break.makeForced());
               }
               allowBlankAfterLastComment =

diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
@@ -166,6 +166,11 @@ public boolean isComment() {
       return isSlashSlashComment() || isSlashStarComment();
     }
 
+    @Override
+    public boolean isTextBlock() {
+      return originalText.startsWith("\"\"\"");
+    }
+
     @Override
     public String toString() {
       return MoreObjects.toStringHelper(this)

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B377585941.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B377585941.output
@@ -1,7 +1,8 @@
 class T {
   {
     f(
-        /* foo */ """
+        /* foo */
+        """
         hello
         """);
   }

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/RSLs.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/RSLs.output
@@ -66,10 +66,12 @@ ipsum
     """
         .formatted("world");
     f(
-        /* foo= */ """
+        /* foo= */
+        """
         foo
         """,
-        /* bar= */ """
+        /* bar= */
+        """
         bar
         """);
   }