Migrating to scalafix 0.6.X

Author: MasseGuillaume

.travis.yml

@@ -76,7 +76,9 @@ matrix:
 # |  oraclejdk8 | 2.13.0-M5 | js           | 0.6.23               |               |
 # |  oraclejdk8 | 2.12.6    | jvm          |                      |   true        |
 
-before_script: ./checkCLA.sh
+before_script:
+  - admin/checkCLA.sh
+
 script:
   - java -version
   - sbt ci

checkCLA.sh renamed to admin/checkCLA.sh

@@ -1,6 +1,9 @@
 import ScalaModulePlugin._
 import sbtcrossproject.{crossProject, CrossType}
-import _root_.scalafix.Versions.{version => scalafixVersion, scala212 => scalafixScala212}
+import _root_.scalafix.internal.sbtscalafix.BuildInfo.{
+  scalafixVersion,
+  scala212 => scalafixScala212
+}
 
 lazy val root = project
   .in(file("."))
@@ -173,7 +176,11 @@ lazy val `scalafix-input` = project
   .settings(dontPublish)
   .settings(
     scalaVersion := scalafixScala212,
-    scalafixSourceroot := sourceDirectory.in(Compile).value
+    addCompilerPlugin(scalafixSemanticdb),
+    scalacOptions ++= Seq(
+      "-Yrangepos",
+      "-P:semanticdb:synthetics:on"
+    )
   )
   .dependsOn(`scalafix-data212`)
 
@@ -183,15 +190,20 @@ val `scalafix-output` = MultiScalaProject("scalafix-output",
                                             .settings(dontPublish)
                                             .disablePlugins(ScalafixPlugin))
 
-lazy val output212    = Def.setting((baseDirectory in ThisBuild).value / "scalafix/output212/src/main")
-lazy val addOutput212 = unmanagedSourceDirectories in Compile += output212.value / "scala"
+lazy val outputCross =
+  Def.setting((baseDirectory in ThisBuild).value / "scalafix/output/src/main/scala")
+
+lazy val output212 =
+  Def.setting((baseDirectory in ThisBuild).value / "scalafix/output212/src/main/scala")
+lazy val addOutput212 = unmanagedSourceDirectories in Compile += output212.value
 
 lazy val output212Plus =
-  Def.setting((baseDirectory in ThisBuild).value / "scalafix/output212+/src/main")
-lazy val addOutput212Plus = unmanagedSourceDirectories in Compile += output212Plus.value / "scala"
+  Def.setting((baseDirectory in ThisBuild).value / "scalafix/output212+/src/main/scala")
+lazy val addOutput212Plus = unmanagedSourceDirectories in Compile += output212Plus.value
 
-lazy val output213    = Def.setting((baseDirectory in ThisBuild).value / "scalafix/output213/src/main")
-lazy val addOutput213 = unmanagedSourceDirectories in Compile += output213.value / "scala"
+lazy val output213 =
+  Def.setting((baseDirectory in ThisBuild).value / "scalafix/output213/src/main/scala")
+lazy val addOutput213 = unmanagedSourceDirectories in Compile += output213.value
 
 lazy val `scalafix-output211` = `scalafix-output`(
   scala211,
@@ -226,28 +238,15 @@ lazy val `scalafix-tests` = project
   .settings(
     scalaVersion := scalafixScala212,
     libraryDependencies += "ch.epfl.scala" % "scalafix-testkit" % scalafixVersion % Test cross CrossVersion.full,
-    buildInfoPackage := "build",
-    buildInfoKeys := Seq[BuildInfoKey](
-      "inputSourceroot"         -> sourceDirectory.in(`scalafix-input`, Compile).value,
-      "outputSourceroot"        -> (baseDirectory in ThisBuild).value / "scalafix/output/src/main",
-      "output212Sourceroot"     -> output212.value,
-      "output212PlusSourceroot" -> output212Plus.value,
-      "output213Sourceroot"     -> output213.value,
-      "output213FailureSourceroot" -> sourceDirectory
-        .in(`scalafix-output213-failure`, Compile)
-        .value,
-      "inputClassdirectory" -> classDirectory.in(`scalafix-input`, Compile).value
-    ),
-    test in Test := (test in Test)
-      .dependsOn(
-        compile in (`scalafix-output211`, Compile),
-        compile in (`scalafix-output212`, Compile),
-        compile in (`scalafix-output213`, Compile)
-      )
-      .value
+    scalafixTestkitOutputSourceDirectories := Seq(outputCross.value,
+                                                  output212.value,
+                                                  output212Plus.value,
+                                                  output213.value),
+    scalafixTestkitInputSourceDirectories := sourceDirectories.in(`scalafix-input`, Compile).value,
+    scalafixTestkitInputClasspath := fullClasspath.in(`scalafix-input`, Compile).value
   )
   .dependsOn(`scalafix-input`, `scalafix-rules`)
-  .enablePlugins(BuildInfoPlugin)
+  .enablePlugins(BuildInfoPlugin, ScalafixTestkitPlugin)
 
 lazy val dontPublish = Seq(
   publishArtifact := false,

build.sbt

@@ -10,7 +10,7 @@ val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty)
 addSbtPlugin("org.scala-js"           % "sbt-scalajs"              % scalaJSVersion)
 addSbtPlugin("org.portable-scala"     % "sbt-scalajs-crossproject" % "0.5.0")
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module"         % "1.0.14")
-addSbtPlugin("ch.epfl.scala"          % "sbt-scalafix"             % "0.5.10")
+addSbtPlugin("ch.epfl.scala"          % "sbt-scalafix"             % "0.6.0-M15")
 addSbtPlugin("com.eed3si9n"           % "sbt-buildinfo"            % "0.7.0")
 addSbtPlugin("com.typesafe.sbt"       % "sbt-pgp"                  % "0.8.3")
 

project/plugins.sbt

@@ -103,4 +103,5 @@ class BreakoutSrc(ts: Traversable[Int], vec: Vector[Int], list: List[Int], seq:
   List(1 -> "1").map(x => x)(breakOut): immutable.IntMap[String]
   List(1L -> "1").map(x => x)(breakOut): immutable.LongMap[String]
   List(1L -> "1").map(x => x)(breakOut): mutable.LongMap[String]
+  List(1).map(x => x)(breakOut): collection.BitSet
 }

scalafix/input/src/main/scala/fix/BreakoutSrc.scala

@@ -3,40 +3,40 @@ rule = "scala:fix.CrossCompat"
  */
 package fix
 
-import scala.collection.immutable
-import scala.collection.mutable
+import scala.{collection => c}
+import scala.collection.{immutable => i, mutable => m}
 
 object CompanionSrc {
 
-  (null: collection.IndexedSeq[Int]).companion
-  (null: collection.Iterable[Int]).companion
-  (null: collection.Seq[Int]).companion
-  (null: collection.Traversable[Int]).companion
+  (null: c.IndexedSeq[Int]).companion
+  (null: c.Iterable[Int]).companion
+  (null: c.Seq[Int]).companion
+  (null: c.Traversable[Int]).companion
 
-  (null: immutable.HashSet[Int]).companion
-  (null: immutable.IndexedSeq[Int]).companion
-  (null: immutable.Iterable[Int]).companion
-  (null: immutable.LinearSeq[Int]).companion
-  (null: immutable.List[Int]).companion
-  (null: immutable.ListSet[Int]).companion
-  (null: immutable.Queue[Int]).companion
-  (null: immutable.Seq[Int]).companion
-  (null: immutable.Set[Int]).companion
-  (null: immutable.Stream[Int]).companion
-  (null: immutable.Traversable[Int]).companion
-  (null: immutable.Vector[Int]).companion
+  (null: i.HashSet[Int]).companion
+  (null: i.IndexedSeq[Int]).companion
+  (null: i.Iterable[Int]).companion
+  (null: i.LinearSeq[Int]).companion
+  (null: i.List[Int]).companion
+  (null: i.ListSet[Int]).companion
+  (null: i.Queue[Int]).companion
+  (null: i.Seq[Int]).companion
+  (null: i.Set[Int]).companion
+  (null: i.Stream[Int]).companion
+  (null: i.Traversable[Int]).companion
+  (null: i.Vector[Int]).companion
 
-  (null: mutable.ArrayBuffer[Int]).companion
-  (null: mutable.ArraySeq[Int]).companion
-  (null: mutable.ArrayStack[Int]).companion
-  (null: mutable.Buffer[Int]).companion
-  (null: mutable.HashSet[Int]).companion
-  (null: mutable.IndexedSeq[Int]).companion
-  (null: mutable.Iterable[Int]).companion
-  (null: mutable.LinearSeq[Int]).companion
-  (null: mutable.LinkedHashSet[Int]).companion
-  (null: mutable.Queue[Int]).companion
-  (null: mutable.Seq[Int]).companion
-  (null: mutable.Set[Int]).companion
-  (null: mutable.Traversable[Int]).companion
+  (null: m.ArrayBuffer[Int]).companion
+  (null: m.ArraySeq[Int]).companion
+  (null: m.ArrayStack[Int]).companion
+  (null: m.Buffer[Int]).companion
+  (null: m.HashSet[Int]).companion
+  (null: m.IndexedSeq[Int]).companion
+  (null: m.Iterable[Int]).companion
+  (null: m.LinearSeq[Int]).companion
+  (null: m.LinkedHashSet[Int]).companion
+  (null: m.Queue[Int]).companion
+  (null: m.Seq[Int]).companion
+  (null: m.Set[Int]).companion
+  (null: m.Traversable[Int]).companion
 }

scalafix/input/src/main/scala/fix/CompanionSrc.scala

@@ -4,6 +4,7 @@ rule = "scala:fix.CrossCompat"
 package fix
 
 class SetMapSrc(set: Set[Int], map: Map[Int, Int]) {
+  set + 1
   set + (2, 3)
   map + (2 -> 3, 3 -> 4)
   (set + (2, 3)).toString

scalafix/input/src/main/scala/fix/SetMapSrc.scala

@@ -11,6 +11,7 @@ trait TraversableSrc {
   val cto: collection.TraversableOnce[Int]
 
   val t: Traversable[Int]
+  t.toIterator
   val ct: collection.Traversable[Int]
   val it: immutable.Traversable[Int]
   val mt: mutable.Traversable[Int]

scalafix/input/src/main/scala/fix/TraversableSrc.scala

@@ -6,6 +6,7 @@ package fix
 import scala.collection.{immutable, mutable}
 import scala.concurrent.Future
 import scala.concurrent.ExecutionContext.Implicits.global
+import scala.Iterable
 import scala.collection.compat._
 
 class BreakoutSrc(ts: Iterable[Int], vec: Vector[Int], list: List[Int], seq: Seq[Int]) {
@@ -103,4 +104,5 @@ class BreakoutSrc(ts: Iterable[Int], vec: Vector[Int], list: List[Int], seq: Seq
   scala.collection.immutable.IntMap.from(List(1 -> "1").iterator.map(x => x)): immutable.IntMap[String]
   scala.collection.immutable.LongMap.from(List(1L -> "1").iterator.map(x => x)): immutable.LongMap[String]
   scala.collection.mutable.LongMap.from(List(1L -> "1").iterator.map(x => x)): mutable.LongMap[String]
+  scala.collection.BitSet.from(List(1).iterator.map(x => x)): collection.BitSet
 }

scalafix/output/src/main/scala/fix/BreakoutSrc.scala

@@ -3,41 +3,43 @@
 
 package fix
 
-import scala.collection.immutable
-import scala.collection.mutable
+import scala.{collection => c}
+import scala.collection.{immutable => i, mutable => m}
+import scala.collection
+import scala.collection.{ immutable, mutable }
 import scala.collection.compat._
 
 object CompanionSrc {
 
-  (null: collection.IndexedSeq[Int]).iterableFactory
-  (null: collection.Iterable[Int]).iterableFactory
-  (null: collection.Seq[Int]).iterableFactory
+  (null: c.IndexedSeq[Int]).iterableFactory
+  (null: c.Iterable[Int]).iterableFactory
+  (null: c.Seq[Int]).iterableFactory
   (null: collection.Iterable[Int]).iterableFactory
 
-  (null: immutable.HashSet[Int]).iterableFactory
-  (null: immutable.IndexedSeq[Int]).iterableFactory
-  (null: immutable.Iterable[Int]).iterableFactory
-  (null: immutable.LinearSeq[Int]).iterableFactory
-  (null: immutable.List[Int]).iterableFactory
-  (null: immutable.ListSet[Int]).iterableFactory
-  (null: immutable.Queue[Int]).iterableFactory
-  (null: immutable.Seq[Int]).iterableFactory
-  (null: immutable.Set[Int]).iterableFactory
-  (null: immutable.Stream[Int]).iterableFactory
+  (null: i.HashSet[Int]).iterableFactory
+  (null: i.IndexedSeq[Int]).iterableFactory
+  (null: i.Iterable[Int]).iterableFactory
+  (null: i.LinearSeq[Int]).iterableFactory
+  (null: i.List[Int]).iterableFactory
+  (null: i.ListSet[Int]).iterableFactory
+  (null: i.Queue[Int]).iterableFactory
+  (null: i.Seq[Int]).iterableFactory
+  (null: i.Set[Int]).iterableFactory
+  (null: i.Stream[Int]).iterableFactory
   (null: immutable.Iterable[Int]).iterableFactory
-  (null: immutable.Vector[Int]).iterableFactory
-
-  (null: mutable.ArrayBuffer[Int]).iterableFactory
-  (null: mutable.ArraySeq[Int]).iterableFactory
-  (null: mutable.ArrayStack[Int]).iterableFactory
-  (null: mutable.Buffer[Int]).iterableFactory
-  (null: mutable.HashSet[Int]).iterableFactory
-  (null: mutable.IndexedSeq[Int]).iterableFactory
-  (null: mutable.Iterable[Int]).iterableFactory
-  (null: mutable.LinearSeq[Int]).iterableFactory
-  (null: mutable.LinkedHashSet[Int]).iterableFactory
-  (null: mutable.Queue[Int]).iterableFactory
-  (null: mutable.Seq[Int]).iterableFactory
-  (null: mutable.Set[Int]).iterableFactory
+  (null: i.Vector[Int]).iterableFactory
+
+  (null: m.ArrayBuffer[Int]).iterableFactory
+  (null: m.ArraySeq[Int]).iterableFactory
+  (null: m.ArrayStack[Int]).iterableFactory
+  (null: m.Buffer[Int]).iterableFactory
+  (null: m.HashSet[Int]).iterableFactory
+  (null: m.IndexedSeq[Int]).iterableFactory
+  (null: m.Iterable[Int]).iterableFactory
+  (null: m.LinearSeq[Int]).iterableFactory
+  (null: m.LinkedHashSet[Int]).iterableFactory
+  (null: m.Queue[Int]).iterableFactory
+  (null: m.Seq[Int]).iterableFactory
+  (null: m.Set[Int]).iterableFactory
   (null: mutable.Iterable[Int]).iterableFactory
 }