WIP

Author: olafurpg

build.sbt

@@ -17,16 +17,16 @@ lazy val input = project.settings(
   scalafixSourceroot := sourceDirectory.in(Compile).value
 )
 
-val collections = ProjectRef(file(".."), "collections")
-
+//val collections = ProjectRef(file(".."), "collections")
+//
 lazy val output = project
   .settings(
-    resolvers := resolvers.in(collections).value,
-    libraryDependencies := libraryDependencies.in(collections).value,
-    scalaVersion := scalaVersion.in(collections).value,
-    scalaBinaryVersion := scalaBinaryVersion.in(collections).value
+//    resolvers := resolvers.in(collections).value,
+//    libraryDependencies := libraryDependencies.in(collections).value,
+//    scalaVersion := scalaVersion.in(collections).value,
+//    scalaBinaryVersion := scalaBinaryVersion.in(collections).value
   )
-  .dependsOn(collections) // collections/publishLocal is still necessary.
+//  .dependsOn(collections) // collections/publishLocal is still necessary.
 
 lazy val tests = project
   .settings(

input/src/main/scala/fix/Collectionstrawman_v0.scala

@@ -1,4 +1,4 @@
-/*
+/* ONLY
 rewrite = "scala:fix.Collectionstrawman_v0"
 */
 package fix

input/src/main/scala/fix/ListTest.scala

@@ -1,4 +1,4 @@
-/* ONLY
+/*
 rewrite = "scala:fix.Collectionstrawman_v0"
 */
 package fix

output/src/main/scala/fix/Collectionstrawman_v0.scala

@@ -1,9 +1,7 @@
 package fix
 
-import scala.{ #:: => _, :: => _, List => _, Seq => _, Vector => _ }
-import scala.Predef.{ Map => _ }
-import strawman.collection.immutable.{ HashMap, LazyList, List, Map, Nil, Vector }
-import strawman.collection.immutable.LazyList.#::
+import strawman.collection.{ arrayToArrayOps, stringToStringOps }
+import strawman.collection.immutable.{ #::, ::, HashMap, LazyList, List, Map, Nil, Vector }
 import strawman.collection.mutable.ArrayBuffer
 object Collectionstrawman_v0_List {
   List(1, 2, 3)

rewrites/src/main/scala/fix/Collectionstrawman_v0.scala

@@ -1,67 +1,65 @@
 package fix
 // scalafmt: { maxColumn = 120 }
 
+import scala.collection.JavaConverters._
 import scalafix._
 import scalafix.syntax._
 import scalafix.internal.util.SymbolOps
 import scala.meta._
+import org.scalameta.logger
 
 case class Collectionstrawman_v0(mirror: SemanticCtx) extends SemanticRewrite(mirror) {
   val immutableListSymbol = Symbol("_root_.scala.collection.immutable.List.")
-  val unimports = Set(
-    Symbol("_root_.scala.List."),
-    Symbol("_root_.scala.Seq."),
-    Symbol("_root_.scala.Vector."),
-    Symbol("_root_.scala.`::`."),
-    Symbol("_root_.scala.`#::`."),
-    Symbol("_root_.scala.Predef.Map."),
-    Symbol("_root_.scala.Predef.augmentStrugming."),
-    Symbol("_root_.scala.Predef.intArrayOps.")
+  val unimports = Map(
+    Symbol("_root_.scala.Predef.augmentString.") ->
+      Symbol("_root_.strawman.collection.stringToStringOps."),
+    Symbol("_root_.scala.Predef.intArrayOps.") ->
+      Symbol("_root_.strawman.collection.arrayToArrayOps.")
   )
 
   def ifSymbolFound(ctx: RewriteCtx): Patch = {
-    val toUnimport = ctx.mirror.database.names.flatMap { r =>
-      val norm = r.sym.normalized
-      if (unimports.contains(norm)) norm :: Nil
-      else Nil
-    }
-    val unimportss = toUnimport.toList.distinct.flatMap { sym =>
-      SymbolOps.toImporter(sym).toList.collect {
-        case Importer(qual, Importee.Name(n) :: Nil) =>
-          Importer(qual, Importee.Unimport(n) :: Nil)
-      }
-    }
-    val grouped = unimportss.groupBy(_.ref.syntax).collect {
-      case (qual, iss @ is :: _) =>
-        val names = iss.collect { case Importer(_, name :: Nil) => name }
-        Importer(is.ref, names)
-    }
-    grouped.map(ctx.addGlobalImport(_)).asPatch
+    logger.elem(ctx.mirror.names)
+    val toImport = ctx.mirror.names
+      .flatMap(r =>
+        unimports.get {
+          val x = r.sym.normalized
+          logger.elem(x)
+          x
+      })
+      .map(ctx.addGlobalImport)
+    toImport.asPatch
   }
 
   def rewrite(ctx: RewriteCtx): Patch = {
     def p(name: String) =
       s"scala.Predef.$name" -> s"strawman.collection.immutable.$name"
-    def s(name: String) =
-      s"scala.$name" -> s"strawman.collection.immutable.$name"
+    def s(name: String, rename: Option[String] = None) =
+      s"scala.$name" -> s"strawman.collection.immutable.${rename.getOrElse(name)}"
     def i(name: String) =
       s"scala.collection.immutable.$name" -> s"strawman.collection.immutable.$name"
     def m(name: String) =
       s"scala.collection.mutable.$name" -> s"strawman.collection.mutable.$name"
-//    ifSymbolFound(ctx) +
-    ctx.replaceSymbols(
-      i("HashMap"),
-      i("Map"),
-      p("Map"),
-      s("List"),
-      i("List"),
-      s("Nil"),
-      i("Nil"),
-      s("Stream"),
-      s("`#::`"),
-      s("Vector"),
-      i("Vector"),
-      m("ArrayBuffer")
-    )
+    ifSymbolFound(ctx) +
+      ctx.replaceSymbols(
+        i("HashMap"),
+        i("Map"),
+        p("Map"),
+        s("List"),
+        i("List"),
+        s("Nil"),
+        i("Nil"),
+        s("`::`"),
+        i("`::`"),
+        s("`+:`"),
+        i("`+:`"),
+        s("`:+`"),
+        i("`:+`"),
+        s("Stream", Some("LazyList")),
+        s("`#::`"),
+        s("`#::`"),
+        s("Vector"),
+        i("Vector"),
+        m("ArrayBuffer")
+      )
   }
 }