Various fixes

ShaneDelmore · Dec 21, 2016 · e2f97d6 · e2f97d6
1 parent 7c881ac
commit e2f97d6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import sbt.ScriptedPlugin
 import sbt.ScriptedPlugin._
 import sbtbuildinfo.BuildInfoKey.Entry
 organization in ThisBuild := "ch.epfl.scala"
-version in ThisBuild := "0.2.0"
+version in ThisBuild := "0.2.1-SNAPSHOT"
 
 lazy val crossVersions = Seq("2.11.8", "2.12.1")
 

diff --git a/core/src/main/scala/scalafix/ScalafixConfig.scala b/core/src/main/scala/scalafix/ScalafixConfig.scala
@@ -13,7 +13,7 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
 case class ScalafixConfig(
-    rewrites: Seq[Rewrite] = Rewrite.allRewrites,
+    rewrites: Seq[Rewrite] = Rewrite.defaultRewrites,
     parser: Parse[_ <: Tree] = Parse.parseSource,
     dialect: Dialect = Scala211
 )

diff --git a/core/src/main/scala/scalafix/rewrite/Rewrite.scala b/core/src/main/scala/scalafix/rewrite/Rewrite.scala
@@ -19,6 +19,8 @@ object Rewrite {
   val syntaxRewrites: Seq[Rewrite] = Seq(ProcedureSyntax, VolatileLazyVal)
   val semanticRewrites: Seq[Rewrite] = Seq(ExplicitImplicit)
   val allRewrites: Seq[Rewrite] = syntaxRewrites ++ semanticRewrites
+  val defaultRewrites: Seq[Rewrite] =
+    allRewrites.filterNot(_ == VolatileLazyVal)
   val name2rewrite: Map[String, Rewrite] =
     allRewrites.map(x => x.toString -> x).toMap
 }
diff --git a/scalafix-sbt/src/main/scala/scalafix/sbt/ScalafixPlugin.scala b/scalafix-sbt/src/main/scala/scalafix/sbt/ScalafixPlugin.scala
@@ -37,7 +37,7 @@ object ScalafixPlugin extends AutoPlugin with ScalafixKeys {
       .settings(
         description :=
           """Serves as a caching layer for extracting the jar location of the
-            |scalafix-nsc compiler plugin. If the dependecy was added to all
+            |scalafix-nsc compiler plugin. If the dependency was added to all
             |projects, the (slow) update task will be re-run for every project.""".stripMargin,
         scalaVersion := version,
         libraryDependencies ++= Seq(
@@ -62,7 +62,7 @@ object ScalafixPlugin extends AutoPlugin with ScalafixKeys {
   }
 
   override def globalSettings: Seq[Def.Setting[_]] = Seq(
-    scalafixConfig := None
+    scalafixConfig := Option(file(".scalafix.conf")).filter(_.isFile)
   )
   override def projectSettings: Seq[Def.Setting[_]] =
     Seq(