Rename rules to Collection213...

MasseGuillaume · MasseGuillaume · commit 8301c7d0690b · 2018-09-19T11:53:40.000+02:00
diff --git a/build.sbt b/build.sbt
@@ -157,10 +157,16 @@ lazy val sharedScalafixSettings = Seq(
 )
 
 // common part between input/output
-lazy val `scalafix-data` = MultiScalaProject("scalafix-data",
-                                             "scalafix/data",
-                                             _.settings(sharedScalafixSettings)
-                                               .settings(dontPublish))
+lazy val `scalafix-data` = MultiScalaProject(
+  "scalafix-data",
+  "scalafix/data",
+  _.settings(sharedScalafixSettings)
+    .settings(dontPublish)
+    .settings(
+      addCompilerPlugin(scalafixSemanticdb),
+      scalacOptions += "-P:semanticdb:synthetics:on"
+    )
+)
 
 val `scalafix-data211` = `scalafix-data`(scala211, _.dependsOn(compat211JVM))
 val `scalafix-data212` = `scalafix-data`(scalafixScala212, _.dependsOn(compat212JVM))
diff --git a/scalafix/input/src/main/scala/fix/BreakoutSrc.scala b/scalafix/input/src/main/scala/fix/BreakoutSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/BreakoutSrc212Plus.scala b/scalafix/input/src/main/scala/fix/BreakoutSrc212Plus.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala b/scalafix/input/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/CanBuildFromSrc.scala b/scalafix/input/src/main/scala/fix/CanBuildFromSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/CompanionSrc.scala b/scalafix/input/src/main/scala/fix/CompanionSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/CompanionSrc212.scala b/scalafix/input/src/main/scala/fix/CompanionSrc212.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/CopyToBufferSrc.scala b/scalafix/input/src/main/scala/fix/CopyToBufferSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/ExperimentalSrc.scala b/scalafix/input/src/main/scala/fix/ExperimentalSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Experimental"
+rule = "Collection213Experimental"
  */
 package fix
 
@@ -24,4 +24,4 @@ class ExperimentalSrc(iset: immutable.Set[Int],
   // Map.zip
   imap.zip(List())
   List().zip(List())
-}
+}
diff --git a/scalafix/input/src/main/scala/fix/FoldSrc.scala b/scalafix/input/src/main/scala/fix/FoldSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/FutureSrc.scala b/scalafix/input/src/main/scala/fix/FutureSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/IdempotencySrc.scala b/scalafix/input/src/main/scala/fix/IdempotencySrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/IterableSrc.scala b/scalafix/input/src/main/scala/fix/IterableSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/MutSetMapSrc.scala b/scalafix/input/src/main/scala/fix/MutSetMapSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/ReplaceToSrc.scala b/scalafix/input/src/main/scala/fix/ReplaceToSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/RetainSrc213.scala b/scalafix/input/src/main/scala/fix/RetainSrc213.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.NewCollections"
+rule = "Collection213Upgrade"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/RoughlySrc.scala b/scalafix/input/src/main/scala/fix/RoughlySrc.scala
@@ -1,6 +1,6 @@
 /*
-rule = "scala:fix.Roughly"
-Roughly = {
+rule = "Collection213Roughly"
+Collection213Roughly = {
   strictMapValues = true
   strictFilterKeys = true
 }
diff --git a/scalafix/input/src/main/scala/fix/RoughlySrc213.scala b/scalafix/input/src/main/scala/fix/RoughlySrc213.scala
@@ -1,6 +1,6 @@
 /*
-rule = "scala:fix.Roughly"
-Roughly = {
+rule = "Collection213Roughly"
+Collection213Roughly = {
   withLazyAppendedAll = true
   withLazyList = true
 }
diff --git a/scalafix/input/src/main/scala/fix/SetMapSrc.scala b/scalafix/input/src/main/scala/fix/SetMapSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/SortedSrc.scala b/scalafix/input/src/main/scala/fix/SortedSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/SortedSrc212Plus.scala b/scalafix/input/src/main/scala/fix/SortedSrc212Plus.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/TestsSrc.scala b/scalafix/input/src/main/scala/fix/TestsSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/TraversableSrc.scala b/scalafix/input/src/main/scala/fix/TraversableSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/TupleNZippedSrc213.scala b/scalafix/input/src/main/scala/fix/TupleNZippedSrc213.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.NewCollections"
+rule = "Collection213Upgrade"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/conversions/JavaConversionsExplicitCallSrc.scala b/scalafix/input/src/main/scala/fix/conversions/JavaConversionsExplicitCallSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix.conversions
 
diff --git a/scalafix/input/src/main/scala/fix/conversions/JavaConversionsGlobalImportSrc.scala b/scalafix/input/src/main/scala/fix/conversions/JavaConversionsGlobalImportSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix.conversions
 
diff --git a/scalafix/input/src/main/scala/fix/conversions/JavaConversionsSpecificImportSrc.scala b/scalafix/input/src/main/scala/fix/conversions/JavaConversionsSpecificImportSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.CrossCompat"
+rule = "Collection213CrossCompat"
  */
 package fix.conversions
 
diff --git a/scalafix/rules/src/main/resources/META-INF/services/scalafix.v0.Rule b/scalafix/rules/src/main/resources/META-INF/services/scalafix.v0.Rule
diff --git a/scalafix/rules/src/main/resources/META-INF/services/scalafix.v1.Rule b/scalafix/rules/src/main/resources/META-INF/services/scalafix.v1.Rule
@@ -0,0 +1,4 @@
+scala.fix.collection.Collection213CrossCompat
+scala.fix.collection.Collection213Upgrade
+scala.fix.collection.Collection213Experimental
+scala.fix.collection.Collection213Roughly
diff --git a/scalafix/rules/src/main/scala/fix/CrossCompat.scala b/scalafix/rules/src/main/scala/fix/CrossCompat.scala
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala
@@ -1,4 +1,4 @@
-package fix
+package scala.fix.collection
 
 import scalafix.v0._
 import scala.meta._
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala b/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala
@@ -1,4 +1,4 @@
-package fix
+package scala.fix.collection
 
 import scalafix._
 import scalafix.util._
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala
@@ -0,0 +1,21 @@
+package scala.fix.collection
+
+import scalafix.v0._
+
+import scalafix.internal.v0.LegacySemanticRule
+
+class Collection213CrossCompat
+    extends LegacySemanticRule("Collection213CrossCompat",
+                               index => new Collection213CrossCompatV0(index))
+    with Stable212BaseCheck {
+  override def description: String =
+    "Upgrade to 2.13 collection with cross compatibility for 2.11 and 2.12 (for Libraries)"
+}
+
+case class Collection213CrossCompatV0(index: SemanticdbIndex)
+    extends SemanticRule(index, "CrossCompat")
+    with CrossCompatibility
+    with Stable212Base {
+
+  def isCrossCompatible: Boolean = true
+}
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala
@@ -1,10 +1,22 @@
-package fix
+package scala.fix.collection
 
 import scalafix.v0._
 import scala.meta._
 
+import scalafix.internal.v0.LegacySemanticRule
+
+class Collection213Experimental
+    extends LegacySemanticRule("Collection213Experimental",
+                               index => new Collection213ExperimentalV0(index)) {
+  override def isExperimental: Boolean = true
+
+  override def description: String =
+    "Upgrade to 2.13 collection (see https://github.com/scalameta/scalameta/issues/1212)"
+}
+
 // 2.12 Cross-Compatible
-case class Experimental(index: SemanticdbIndex) extends SemanticRule(index, "Experimental") {
+case class Collection213ExperimentalV0(index: SemanticdbIndex)
+    extends SemanticRule(index, "Collection213Experimental") {
 
   val CollectionMap = TypeMatcher(
     Symbol("scala/collection/immutable/Map#"),
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala
@@ -1,4 +1,4 @@
-package fix
+package scala.fix.collection
 
 import scalafix.v0._
 import scala.meta._
@@ -9,6 +9,17 @@ import metaconfig.annotation.ExampleValue
 import metaconfig.generic
 import metaconfig.generic.Surface
 
+import scalafix.internal.v0.LegacySemanticRule
+
+class Collection213Roughly
+    extends LegacySemanticRule("Collection213Roughly", index => new Collection213RoughlyV0(index)) {
+
+  override def description: String =
+    "Upgrade to 2.13 collection (Runtime semantic are different)"
+
+  override def isExperimental: Boolean = true
+}
+
 /* 2.12 Cross-Compatible
  *
  * This rules is *roughly* correct, they compile but might have a different runtime semantic
@@ -19,8 +30,8 @@ import metaconfig.generic.Surface
  * LazyList has a lazy head, were Stream has a strict head
  *
  */
-final case class Roughly(index: SemanticdbIndex, config: RoughlyConfig)
-    extends SemanticRule(index, "Roughly") {
+final case class Collection213RoughlyV0(index: SemanticdbIndex, config: RoughlyConfig)
+    extends SemanticRule(index, "Collection213Roughly") {
   def this(index: SemanticdbIndex) = this(index, RoughlyConfig.default)
 
   val mapValues =
@@ -62,8 +73,8 @@ final case class Roughly(index: SemanticdbIndex, config: RoughlyConfig)
 
   override def init(config: Conf): Configured[Rule] =
     config
-      .getOrElse("roughly", "Roughly")(RoughlyConfig.default)
-      .map(Roughly(index, _))
+      .getOrElse("Collection213Roughly")(RoughlyConfig.default)
+      .map(Collection213RoughlyV0(index, _))
 
   override def fix(ctx: RuleCtx): Patch = {
     import config._
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala
@@ -1,11 +1,20 @@
-package fix
+package scala.fix.collection
 
 import scalafix.v0._
 import scala.meta._
 
+import scalafix.internal.v0.LegacySemanticRule
+
+class Collection213Upgrade
+    extends LegacySemanticRule("Collection213Upgrade", index => new Collection213UpgradeV0(index))
+    with Stable212BaseCheck {
+  override def description: String =
+    "Upgrade to 2.13 collection (for Application)"
+}
+
 // Not 2.12 Cross-Compatible
-case class NewCollections(index: SemanticdbIndex)
-    extends SemanticRule(index, "NewCollections")
+case class Collection213UpgradeV0(index: SemanticdbIndex)
+    extends SemanticRule(index, "Upgrade213")
     with Stable212Base {
 
   def isCrossCompatible: Boolean = false
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala b/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala
@@ -0,0 +1,21 @@
+package scala.fix.collection
+
+import scalafix.v0._
+import scalafix.util._
+import scala.meta._
+
+case class PlaygroundRule(index: SemanticdbIndex) extends SemanticRule(index, "PlaygroundRule") {
+  override def fix(ctx: RuleCtx): Patch = {
+    // println("yolo")
+    // ctx.tree.collect{
+    //   case tree =>
+    //     ctx.index.denotation(tree).foreach{ denot =>
+    //       println("---")
+    //       println(tree)
+    //       println(denot)
+    //     }
+    // }
+
+    Patch.empty
+  }
+}
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala b/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/package.scala b/scalafix/rules/src/main/scala/scala/fix/collection/package.scala
