.

Author: crogoz

palantir-java-format/src/main/java/com/palantir/javaformat/java/StringWrapper.java

@@ -216,16 +216,15 @@ private void indentTextBlocks(TreeRangeMap<Integer, String> replacements, List<T
                 StringBuilder output = new StringBuilder(initialLines.get(0).stripLeading());
                 for (int i = 0; i < lines.size(); i++) {
                     String line = lines.get(i);
-                    String trimmed = line.stripLeading();
                     output.append(separator);
-                    if (!trimmed.isEmpty()) {
+                    if (!line.isEmpty()) {
                         // Don't add incidental leading whitespace to empty lines
                         output.append(prefix);
                     }
                     if (i == lines.size() - 1) {
-                        String withoutDelimiter = trimmed.substring(0, trimmed.length() - TEXT_BLOCK_DELIMITER.length())
+                        String withoutDelimiter = line.substring(0, line.length() - TEXT_BLOCK_DELIMITER.length())
                                 .stripTrailing();
-                        if (!withoutDelimiter.stripLeading().isEmpty()) {
+                        if (!withoutDelimiter.isEmpty()) {
                             output.append(withoutDelimiter)
                                     .append('\\')
                                     .append(separator)

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/B380299722.input

@@ -1,9 +1,10 @@
 package com.helloworld;
 
 class Foo {
-  void foo() {
-    var bar = """
+    void foo() {
+        var bar = """
         bar\
-         bar""";
-  }
+         bar\
+        """;
+    }
 }

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/B380299722.output

@@ -1,11 +1,10 @@
 package com.helloworld;
 
 class Foo {
-  void foo() {
-    var bar =
-        """
+    void foo() {
+        var bar = """
         bar\
          bar\
         """;
-  }
+    }
 }

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/RSL.input

@@ -1,46 +1,51 @@
 class RSLs {
-  String a = """
-  lorem
+    String a = """
+    lorem
       ipsum
-  """;
-  String b = """
-  lorem
-  ipsum
+    """;
+    String b = """
+    lorem
+    ipsum
       """;
-  String c = """
-  lorem
-  ipsum
-  """;
-  String d = """
-  ipsum
-  """;
-  String e = """
-  """;
-  String f = """
-  ipsum""";
-  String g = """
-  lorem\
-  ipsum
-  """;
-  String h = """
-  lorem\
-  ipsum\
-  """;
-  String i = """
-  lorem
+    String c = """
+    lorem
+    ipsum
+    """;
+    String d = """
+    ipsum
+    """;
+    String e = """
+    """;
+    String f = """
+    ipsum""";
+    String g = """
+    lorem\
+    ipsum
+    """;
+    String h = """
+    lorem\
+    ipsum\
+    """;
+    String i = """
+    lorem
 
-  ipsum
-  """;
-  String j = """
-  lorem
-  one long incredibly unbroken sentence moving from topic to topic so that no one had a chance to interrupt
-  ipsum
-  """;
-  String k = """
-lorem
-ipsum
-""";
-  {
+    ipsum
+    """;
+    String j = """
+    lorem
+    one long incredibly unbroken sentence moving from topic to topic so that no one had a chance to interrupt
+    ipsum
+    """;
+    String k = """
+    lorem
+    ipsum
+    """;
+    String l =
+      """
+      foo
+    bar
+      baz""";
+    {
     f("""
     lorem
     ipsum
@@ -69,11 +74,11 @@ ipsum
             """;
     String t =
         """
-foo
-"""
-            + """
-bar
-""";
+    foo
+    """
+    + """
+    bar
+    """;
     String u =
         stringVariableOne
         +
@@ -84,20 +89,9 @@ bar
                     """
                     ...
                     """;
-  }
+    }
     String x = String.format("""
-          1. when the block looks like a mustache array specification:
-               maven-coordinates:
-                  %1$s#dependencyList%2$s
-                  - %1$sthis%2$s
-                  %1$s/dependencyList%2$s
-             %3$s
-          2. when the block looks like a mustache array specification:
-              maven-coordinates: #%1$sdependencyList%2$s
-             %3$s
-          3. when the block is a simple template tag:
-              maven-coordinates: %1$sdependencyList%2$s
-             %3$s
+          this very long string that does something using arguments %s %s %s
           """,
             "@", "@", "something");
 }

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/RSL.output

@@ -1,7 +1,7 @@
 class RSLs {
     String a = """
     lorem
-        ipsum
+      ipsum
     """;
     String b = """
     lorem
@@ -39,9 +39,14 @@ class RSLs {
             ipsum
             """;
     String k = """
-lorem
-ipsum
-""";
+    lorem
+    ipsum
+    """;
+    String l = """
+      foo
+    bar
+      baz\
+    """;
 
     {
         f("""
@@ -66,10 +71,10 @@ ipsum
         bar
         """;
         String t = """
-foo
-""" + """
-bar
-""";
+        foo
+        """ + """
+    bar
+    """;
         String u = stringVariableOne
                 + """
                 ...
@@ -82,18 +87,7 @@ bar
 
     String x = String.format(
             """
-            1. when the block looks like a mustache array specification:
-                 maven-coordinates:
-                    %1$s#dependencyList%2$s
-                    - %1$sthis%2$s
-                    %1$s/dependencyList%2$s
-               %3$s
-            2. when the block looks like a mustache array specification:
-                maven-coordinates: #%1$sdependencyList%2$s
-               %3$s
-            3. when the block is a simple template tag:
-                maven-coordinates: %1$sdependencyList%2$s
-               %3$s
+            this very long string that does something using arguments %s %s %s
             """,
             "@", "@", "something");
 }