Avoid indenting blank lines, to avoid trailing whitespace.

slick · Oct 8, 2014 · ef5f9a8 · ef5f9a8
1 parent b56947d
commit ef5f9a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/slick-codegen/src/main/scala/scala/slick/codegen/AbstractGenerator.scala b/slick-codegen/src/main/scala/scala/slick/codegen/AbstractGenerator.scala
@@ -383,7 +383,13 @@ abstract class AbstractGenerator[Code,TermName,TypeName](model: m.Model)
 
 /** Helper methods for code generation */
 trait GeneratorHelpers[Code,TermName,TypeName]{
-  def indent(code: String): String = code.split("\n").mkString("\n"+"  ")
+  def indent(code: String): String = {
+    val lines = code.split("\n")
+    lines.tail.foldLeft(lines.head) { (out, line) =>
+      out + '\n' +
+        (if (line.isEmpty) line else "  " + line)
+    }
+  }
 
   /** Assemble doc comment with scala code */
   def docWithCode(comment: String, code:Code): Code

diff --git a/slick-codegen/src/main/scala/scala/slick/codegen/OutputHelpers.scala b/slick-codegen/src/main/scala/scala/slick/codegen/OutputHelpers.scala
@@ -8,7 +8,9 @@ import scala.slick.SlickException
 trait OutputHelpers{
   def code: String
 
-  /** Indents all but the first line of the given string */
+  /** Indents all but the first line of the given string.
+   *  No indent is added to empty lines.
+   */
   def indent(code: String): String
 
   /** Writes given content to a file