Update text block formatting after nickreid's improvements in unknown…

… commit Previously the formatting was adding a forced break at the beginning of text blocks, which caused issues like #1081. With the changes in the baseline CL it correctly handles the 'width' of text blocks containing newlines as infinity, instead of counting the number of characters and treating the newline as having width 1. Fixes #1081 PiperOrigin-RevId: 620933964
google · Apr 1, 2024 · 33bf757 · 33bf757
1 parent 9bdae02
commit 33bf757
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -1667,9 +1667,6 @@ public Void visitMemberSelect(MemberSelectTree node, Void unused) {
   public Void visitLiteral(LiteralTree node, Void unused) {
     sync(node);
     String sourceForNode = getSourceForNode(node, getCurrentPath());
-    if (sourceForNode.startsWith("\"\"\"")) {
-      builder.forcedBreak();
-    }
     if (isUnaryMinusLiteral(sourceForNode)) {
       token("-");
       sourceForNode = sourceForNode.substring(1).trim();

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/RSLs.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/RSLs.input
@@ -40,4 +40,15 @@ class RSLs {
 lorem
 ipsum
 """;
+  {
+    f("""
+    lorem
+    ipsum
+    """, 42);
+
+    """
+    hello %s
+    """
+        .formatted("world");
+  }
 }
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
@@ -51,4 +51,18 @@ ipsum
 lorem
 ipsum
 """;
+
+  {
+    f(
+        """
+        lorem
+        ipsum
+        """,
+        42);
+
+    """
+    hello %s
+    """
+        .formatted("world");
+  }
 }