TextBlock noindent

jcodemodel/src/main/java/com/helger/jcodemodel/IJFormatter.java

@@ -89,6 +89,11 @@ public interface IJFormatter extends Closeable
    */
   @NonNull
   IJFormatter newline ();
+
+  /**
+   * @return the internal String used for new lines.
+   */
+  String getNewLine();
 
   /**
    * Print a char into the stream

jcodemodel/src/main/java/com/helger/jcodemodel/JTextBlock.java

@@ -172,8 +172,9 @@ public boolean keepWhitespaces ()
    */
   public @NonNull JTextBlock add (final @Nullable String line)
   {
-    if (line != null)
+    if (line != null) {
       formatLines (line).forEach (m_aLines::add);
+    }
 
     return this;
   }
@@ -207,6 +208,7 @@ public boolean keepWhitespaces ()
   /**
    * unmodifiable iterator over the internal lines
    */
+  @Override
   public @NonNull Iterator <String> iterator ()
   {
     return Collections.unmodifiableList (m_aLines).iterator ();
@@ -217,9 +219,12 @@ public boolean keepWhitespaces ()
     return m_aLines.stream ();
   }
 
+  @Override
   public void generate (@NonNull final IJFormatter f)
   {
-    f.print (LIMITER).newline ();
+    StringBuilder sb = new StringBuilder();
+    String newLine = f.getNewLine();
+    sb.append(LIMITER).append(newLine);
     final String indent = m_nIndentSize <= 0 || m_aLines.isEmpty () ? ""
                                                                     : Character.toString (m_cIndentChar)
                                                                                .repeat (m_nIndentSize);
@@ -244,8 +249,9 @@ public void generate (@NonNull final IJFormatter f)
 
     for (String line : modifiedLines)
     {
-      if (!firstLine)
-        f.newline ();
+      if (!firstLine) {
+        sb.append(newLine);
+      }
 
       if (escapeFirstChar && !line.isEmpty ())
       {
@@ -260,17 +266,18 @@ public void generate (@NonNull final IJFormatter f)
         line = RegExHelper.stringReplacePattern (" $", line, "\\\\s");
         line = RegExHelper.stringReplacePattern ("\t$", line, "\\\\t");
       }
-      f.print (indent).print (line);
+      sb.append(indent).append(line);
       firstLine = false;
       lastEmpty = line.isEmpty ();
     }
-    f.print (LIMITER);
+    sb.append(LIMITER);
     if (!lastEmpty && m_nIndentSize > 0)
     {
       // if the last line is not empty, then the delimiter is not enough to enforce
       // the indent. So we add a call after that.
-      f.print (".indent(").print (Integer.toString (m_nIndentSize)).print (")");
+      sb.append(".indent(").append (Integer.toString (m_nIndentSize)).append (")");
     }
+    f.print(sb.toString());
   }
 
   /**
@@ -284,18 +291,21 @@ public void generate (@NonNull final IJFormatter f)
    */
   static boolean requiresEscapeFirstChar (final boolean keepWhitespaces, final @NonNull List <String> lines)
   {
-    if (!keepWhitespaces)
+    if (!keepWhitespaces) {
       return false;
+    }
 
-    if (lines.isEmpty ())
+    if (lines.isEmpty ()) {
       return false;
+    }
 
     // no non-blank line that does not start with a space or tab
     if (lines.stream ()
              .filter (l -> !(l.isBlank () || l.startsWith (" ") || l.startsWith ("\t")))
              .findAny ()
-             .isPresent ())
+             .isPresent ()) {
       return false;
+    }
 
     // if last line does not start with space/tab we don't need to escape, blank or
     // not.

jcodemodel/src/main/java/com/helger/jcodemodel/writer/JFormatter.java

@@ -462,6 +462,11 @@ public JFormatter setJavaFeature (final int nJavaFeature)
     m_nJavaFeature = nJavaFeature;
     return this;
   }
+
+  public String getNewLine()
+  {
+    return m_aPW.getNewLine();
+  }
 
   public boolean isPrinting ()
   {

jcodemodel/src/main/java/com/helger/jcodemodel/writer/SourcePrintWriter.java

@@ -65,6 +65,11 @@ public SourcePrintWriter (@NonNull final Writer aWrappedWriter, @NonNull final S
     super (aWrappedWriter);
     m_sNewLine = sNewLine;
   }
+
+  public String getNewLine()
+  {
+    return m_sNewLine;
+  }
 
   private void _handleException (@NonNull final IOException ex, @NonNull final String sSource)
   {

jcodemodeltests/src/generated/javatest/com/helger/jcodemodel/tests/textblocks/TextBlocksExample.java

@@ -19,28 +19,28 @@
 @Generated("com.helger.jcodemodel.JCodeModel")
 public class TextBlocksExample {
     public static final String EMPTY = """
-    """;
+""";
     public static final String ONE_LINE = """
-    a""";
+a""";
     public static final String TWO_LINES = """
-    a
-    b""";
+a
+b""";
     public static final String TWO_DOUBLE_DQUOTES_LINES = """
-    ""
-    "\"""";
+""
+"\"""";
     public static final String TWO_TRIPLE_DQUOTES_LINES = """
-    ""\"
-    ""\"""";
+""\"
+""\"""";
     public static final String FIVE_DQUOTES = """
-    ""\""\"""";
+""\""\"""";
     public static final String TWO_FIVE_DQUOTES_LINES = """
-    ""\"""
-    ""\""\"""";
+""\"""
+""\""\"""";
     public static final String ONE_LINE_ENDSPACE = """
-    a  """;
+a  """;
     public static final String ONE_LINE_ENDTAB = """
-    a		""";
+a		""";
     public static final String TWO_LINES_ENDTAB = """
-    a		
-    b		""";
+a		
+b		""";
 }

jcodemodeltests/src/generated/javatest/com/helger/jcodemodel/tests/textblocks/TextBlocksKeepWhiteSpaces.java

@@ -19,22 +19,22 @@
 @Generated("com.helger.jcodemodel.JCodeModel")
 public class TextBlocksKeepWhiteSpaces {
     public static final String ONE_LINE_SPACES = """
-    \s a \s""";
+\s a \s""";
     public static final String ONE_LINE_TABS = """
-    \ta\t""";
+\ta\t""";
     public static final String SPACES_EMPTYLINE = """
-     \s
-    """;
+ \s
+""";
     public static final String THREE_LINES_SPACES = """
-    \sa\s
-     b\s
-     c \s""";
+\sa\s
+ b\s
+ c \s""";
     public static final String EMPTY_THEN_SPACED = """
 
-    \s a""";
+\s a""";
     public static final String TWO_EMPTY_LINES_2SPACES_3SPACES = """
 
 
-    \s\s
-      \s""";
+\s\s
+  \s""";
 }

sh/cfg/tabspaces

@@ -5,4 +5,4 @@
 echo "*.java filter=tabspace" > .git/info/attributes               # tell git to apply the tabspace script on the *.java files
 echo "*.xml filter=tabspace" >> .git/info/attributes               # tell git to apply the tabspace script on the *.xml files
 git config filter.tabspace.clean 'expand --tabs=2 --initial'       # replace tabs with two spaces when commit of *.java files
-git config filter.tabspace.smudge 'unexpand --tabs=2 --first-only' # replace double spaces with two tabs when checking a *.java file out
+#git config filter.tabspace.smudge 'unexpand --tabs=2 --first-only' # replace double spaces with two tabs when checking a *.java file out