Merge pull request #448 from cvogt/chris

unify reflectively loading builds from directories

1 files changed, 7 insertions, 4 deletions

diff --git a/plugins/scalariform/Scalariform.scala b/plugins/scalariform/Scalariform.scala
index 8cfc252..83a8bbf 100644
--- a/plugins/scalariform/Scalariform.scala
+++ b/plugins/scalariform/Scalariform.scala
@@ -5,11 +5,11 @@ import java.nio.file.FileSystems
 import java.nio.file.Files._
 
 import scalariform.formatter.ScalaFormatter
-import scalariform.formatter.preferences.FormattingPreferences
+import scalariform.formatter.preferences.{ FormattingPreferences, Preserve }
 import scalariform.parser.ScalaParserException
 
 trait Scalariform extends BaseBuild {
-  def scalariform = Scalariform.apply(lib, sourceFiles.filter(_.string endsWith ".scala"), scalaVersion).config()
+  def scalariform = Scalariform.apply(lib, scalaVersion).config(sourceFiles.filter(_.string endsWith ".scala"))
 }
 
 object Scalariform{
@@ -24,11 +24,14 @@ object Scalariform{
       .setPreference(SpacesWithinPatternBinders, true)
       .setPreference(SpacesAroundMultiImports, true)
       .setPreference(DoubleIndentClassDeclaration, false)
+      //.setPreference(NewlineAtEndOfFile, true)
+      .setPreference(DanglingCloseParenthesis, Preserve)
+      .setPreference(PlaceScaladocAsterisksBeneathSecondAsterisk, true)
   }
 
-  case class apply( lib: Lib, files: Seq[File], scalaVersion: String ){
+  case class apply( lib: Lib, scalaVersion: String ){
     case class config(
-      preferences: FormattingPreferences = Scalariform.defaultPreferences
+      files: Seq[File], preferences: FormattingPreferences = Scalariform.defaultPreferences
     ) extends (() => Seq[File]){
       def apply = {
         val (successes, errors) = lib.transformFilesOrError( files, in =>