fix textBlock indentation

Author: crogoz

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

@@ -55,7 +55,6 @@
 import com.palantir.javaformat.Indent;
 import com.palantir.javaformat.Input;
 import com.palantir.javaformat.LastLevelBreakability;
-import com.palantir.javaformat.Newlines;
 import com.palantir.javaformat.Op;
 import com.palantir.javaformat.OpenOp;
 import com.palantir.javaformat.OpsBuilder;
@@ -144,7 +143,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import javax.lang.model.element.Name;
@@ -1632,28 +1630,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("\"\"\"")) {
-            String separator = Newlines.guessLineSeparator(sourceForNode);
-            ImmutableList<String> initialLines = sourceForNode.lines().collect(ImmutableList.toImmutableList());
-            String stripped = initialLines.stream()
-                    .skip(1)
-                    .collect(Collectors.joining(separator))
-                    .stripIndent();
-            // Use the last line of the text block to determine if it is deindented to column 0, by
-            // comparing the length of the line in the input source with the length after processing
-            // the text block contents with stripIndent().
-            boolean deindent = getLast(initialLines).stripTrailing().length()
-                    == Streams.findLast(stripped.lines())
-                            .orElseThrow()
-                            .stripTrailing()
-                            .length();
-            if (deindent) {
-                Indent indent = Indent.Const.make(Integer.MIN_VALUE / indentMultiplier, indentMultiplier);
-                builder.breakOp(indent);
-            }
-            token(sourceForNode);
-            return null;
-        }
         // A negative numeric literal -n is usually represented as unary minus on n,
         // but that doesn't work for integer or long MIN_VALUE. The parser works
         // around that by representing it directly as a signed literal (with no

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

@@ -194,7 +194,7 @@ private void indentTextBlocks(TreeRangeMap<Integer, String> replacements, List<T
                 String text = input.substring(startPosition, endPosition);
                 int lineStartPosition = lineMap.getStartPosition(lineMap.getLineNumber(startPosition));
                 int startColumn =
-                        CharMatcher.whitespace().negate().indexIn(input.substring(lineStartPosition, endPosition)) + 1;
+                        CharMatcher.whitespace().negate().indexIn(input.substring(lineStartPosition, endPosition));
 
                 // Find the source code of the text block with incidental whitespace removed.
                 // The first line of the text block is always """, and it does not affect incidental
@@ -205,15 +205,11 @@ private void indentTextBlocks(TreeRangeMap<Integer, String> replacements, List<T
                         .collect(joining(separator))
                         .stripIndent();
                 ImmutableList<String> lines = stripped.lines().collect(ImmutableList.toImmutableList());
-                int deindent = getLast(initialLines).stripTrailing().length()
-                        - getLast(lines).stripTrailing().length();
 
-                String prefix =
-                        (deindent == 0 || lines.stream().anyMatch(x -> x.length() + startColumn - 1 > columnLimit))
-                                ? ""
-                                : " ".repeat(startColumn - 1);
+                String prefix = (lineStartPosition + startColumn + 4 > startPosition ? "" : " ".repeat(4))
+                        + " ".repeat(startColumn);
 
-                StringBuilder output = new StringBuilder(initialLines.get(0).stripLeading());
+                StringBuilder output = new StringBuilder(initialLines.get(0));
                 for (int i = 0; i < lines.size(); i++) {
                     String line = lines.get(i);
                     output.append(separator);

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

@@ -1,7 +1,7 @@
 class T {
     {
         f(/* foo */ """
-        hello
-        """);
+            hello
+            """);
     }
 }

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

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

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

@@ -1,7 +1,7 @@
 public interface Foo {
 
     private static String foo = """
-    foo\
-    bar\
-    """;
+        foo\
+        bar\
+        """;
 }

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

@@ -72,13 +72,21 @@ class RSLs {
             + """
             bar
             """;
-    String t =
+    // TODO(crogoz): fix formatSource rendering of this block
+    String broken =
         """
     foo
     """
     + """
     bar
     """;
+        String working =
+            """
+        foo
+        """
+        + """
+        bar
+        """;
     String u =
         stringVariableOne
         +
@@ -90,6 +98,8 @@ class RSLs {
                     ...
                     """;
     }
+
+
     String x = String.format("""
           this very long string that does something using arguments %s %s %s
           """,

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

@@ -1,52 +1,52 @@
 class RSLs {
     String a = """
-    lorem
-      ipsum
-    """;
+        lorem
+          ipsum
+        """;
     String b = """
-    lorem
-    ipsum
-    """;
+        lorem
+        ipsum
+        """;
     String c = """
-    lorem
-    ipsum
-    """;
+        lorem
+        ipsum
+        """;
     String d = """
-    ipsum
-    """;
+        ipsum
+        """;
     String e = """
-    """;
+        """;
     String f = """
-    ipsum\
-    """;
+        ipsum\
+        """;
     String g = """
-    lorem\
-    ipsum
-    """;
+        lorem\
+        ipsum
+        """;
     String h = """
-    lorem\
-    ipsum\
-    """;
+        lorem\
+        ipsum\
+        """;
     String i = """
-    lorem
+        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
-    """;
+        lorem
+        ipsum
+        """;
     String l = """
-      foo
-    bar
-      baz\
-    """;
+          foo
+        bar
+          baz\
+        """;
 
     {
         f("""
@@ -58,23 +58,29 @@ class RSLs {
         hello %s
         """.formatted("world");
         f(/* foo= */ """
-        foo
-        """, /* bar= */ """
-        bar
-        """);
+            foo
+            """, /* bar= */ """
+            bar
+            """);
         """
         hello
         """.codePoints().forEach(System.err::println);
         String s = """
-        foo
-        """ + """
+            foo
+            """ + """
+            bar
+            """;
+        // TODO(crogoz): fix formatSource rendering of this block
+        String broken = """
+            foo
+            """ + """
         bar
         """;
-        String t = """
-        foo
-        """ + """
-    bar
-    """;
+        String working = """
+            foo
+            """ + """
+            bar
+            """;
         String u = stringVariableOne
                 + """
                 ...