Move LazyList and Map.mapValue rules to separate rules (fix #56)

MasseGuillaume · MasseGuillaume · commit 4d94ab76ebca · 2018-06-29T09:16:02.000+02:00
diff --git a/README.md b/README.md
@@ -54,5 +54,5 @@ report it as described in the
 Run the following sbt task on your project:
 
 ~~~
-> scalafix github:scala/scala-collection-compat/NewCollections
+> scalafix github:scala/scala-collection-compat/Stable
 ~~~
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.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 package fix
 
@@ -22,4 +22,4 @@ object BreakoutSrc {
   (1 +: xs)(breakOut): Set[Int]
   (xs :+ 1)(breakOut): Set[Int]
   (xs ++: xs)(breakOut): Set[Int]
-}
+}
diff --git a/scalafix/input/src/main/scala/fix/CanBuildFromNegSrc.scala b/scalafix/input/src/main/scala/fix/CanBuildFromNegSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 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.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 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.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 package fix
 
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.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 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.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/LinearSeqSrc.scala b/scalafix/input/src/main/scala/fix/LinearSeqSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 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.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/RetainSrc.scala b/scalafix/input/src/main/scala/fix/RetainSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 package fix
 
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.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 package fix
 
@@ -8,5 +8,4 @@ class SetMapSrc(set: Set[Int], map: Map[Int, Int]) {
   map + (2 -> 3, 3 -> 4)
   (set + (2, 3)).toString
   set + (2, 3) - 4
-  map.mapValues(_ + 1)
-}
+}
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.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 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.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 package fix
 
diff --git a/scalafix/input/src/main/scala/fix/TupleNZippedSrc.scala b/scalafix/input/src/main/scala/fix/TupleNZippedSrc.scala
@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Scalacollectioncompat_newcollections"
+rule = "scala:fix.Stable"
  */
 package fix
 
@@ -14,7 +14,7 @@ object Collectionstrawman_v0_Tuple2Zipped {
       ys).zipped
     /* a */(/* b */ xs /* c */, /* d */ ys /* e */)/* f */./* g */zipped/* h */
     (coll(1), coll(2)).zipped
-    (List(1, 2, 3), Stream.from(1)).zipped
+    (List(1, 2, 3), Array(1)).zipped
   }
   def coll(x: Int): List[Int] = ???
 }
@@ -30,7 +30,7 @@ object Collectionstrawman_v0_Tuple3Zipped {
       zs).zipped
     /* a */(/* b */ xs /* c */, /* d */ ys /* e */, /* f */ zs /* g */)/* h */./* i */zipped/* j */
     (coll(1), coll(2), coll(3)).zipped
-    (List(1, 2, 3), Set(1, 2, 3), Stream.from(1)).zipped
+    (List(1, 2, 3), Set(1, 2, 3), Array(1)).zipped
   }
   def coll(x: Int): List[Int] = ???
 }
diff --git a/scalafix/input/src/main/scala/fix/UnstableMapValuesSrc.scala b/scalafix/input/src/main/scala/fix/UnstableMapValuesSrc.scala
@@ -0,0 +1,8 @@
+/*
+rule = "scala:fix.UnstableMapValues"
+ */
+package fix
+
+class UnstableMapValuesSrc(map: Map[Int, Int]) {
+  map.mapValues(_ + 1)
+}
diff --git a/scalafix/input/src/main/scala/fix/UnstableStreamToLazyListSrc.scala b/scalafix/input/src/main/scala/fix/UnstableStreamToLazyListSrc.scala
@@ -1,9 +1,9 @@
 /*
-rule = "scala:fix.Scalacollectioncompat_newcollections"
+rule = "scala:fix.UnstableStreamToLazyList"
  */
 package fix
 
-object StreamSrc {
+class UnstableStreamToLazyListSrc() {
   val s = Stream(1, 2, 3)
   s.append(List(4, 5, 6))
   1 #:: 2 #:: 3 #:: Stream.Empty
diff --git a/scalafix/output/src/main/scala/fix/CopyToBufferSrc.scala b/scalafix/output/src/main/scala/fix/CopyToBufferSrc.scala
@@ -1,3 +1,6 @@
+
+
+
 package fix
 
 import scala.collection.mutable
diff --git a/scalafix/output/src/main/scala/fix/RetainSrc.scala b/scalafix/output/src/main/scala/fix/RetainSrc.scala
@@ -1,3 +1,6 @@
+
+
+
 package fix
 
 import scala.collection.mutable.{Map, Set}
diff --git a/scalafix/output/src/main/scala/fix/SetMapSrc.scala b/scalafix/output/src/main/scala/fix/SetMapSrc.scala
@@ -8,5 +8,4 @@ class SetMapSrc(set: Set[Int], map: Map[Int, Int]) {
   map + (2 -> 3) + (3 -> 4)
   (set + 2 + 3).toString
   set + 2 + 3 - 4
-  map.mapValues(_ + 1).toMap
 }
diff --git a/scalafix/output/src/main/scala/fix/TraversableSrc.scala b/scalafix/output/src/main/scala/fix/TraversableSrc.scala
@@ -1,3 +1,6 @@
+
+
+
 package fix
 
 object TraversableSrc {
diff --git a/scalafix/output/src/main/scala/fix/TupleNZippedSrc.scala b/scalafix/output/src/main/scala/fix/TupleNZippedSrc.scala
@@ -1,3 +1,6 @@
+
+
+
 package fix
 
 import scala.language.postfixOps
@@ -11,7 +14,7 @@ object Collectionstrawman_v0_Tuple2Zipped {
       ys)
     /* a *//* b */ xs /* c */.lazyZip(/* d */ ys /* e */)/* f *//* g *//* h */
     coll(1).lazyZip(coll(2))
-    List(1, 2, 3).lazyZip(LazyList.from(1))
+    List(1, 2, 3).lazyZip(Array(1))
   }
   def coll(x: Int): List[Int] = ???
 }
@@ -27,7 +30,7 @@ object Collectionstrawman_v0_Tuple3Zipped {
       zs)
     /* a *//* b */ xs /* c */.lazyZip(/* d */ ys /* e */).lazyZip(/* f */ zs /* g */)/* h *//* i *//* j */
     coll(1).lazyZip(coll(2)).lazyZip(coll(3))
-    List(1, 2, 3).lazyZip(Set(1, 2, 3)).lazyZip(LazyList.from(1))
+    List(1, 2, 3).lazyZip(Set(1, 2, 3)).lazyZip(Array(1))
   }
   def coll(x: Int): List[Int] = ???
 }
diff --git a/scalafix/output/src/main/scala/fix/UnstableMapValuesSrc.scala b/scalafix/output/src/main/scala/fix/UnstableMapValuesSrc.scala
@@ -0,0 +1,8 @@
+
+
+
+package fix
+
+class UnstableMapValuesSrc(map: Map[Int, Int]) {
+  map.mapValues(_ + 1).toMap
+}
diff --git a/scalafix/output/src/main/scala/fix/UnstableStreamToLazyListSrc.scala b/scalafix/output/src/main/scala/fix/UnstableStreamToLazyListSrc.scala
@@ -1,6 +1,9 @@
+
+
+
 package fix
 
-object StreamSrc {
+class UnstableStreamToLazyListSrc() {
   val s = LazyList(1, 2, 3)
   s.lazyAppendedAll(List(4, 5, 6))
   1 #:: 2 #:: 3 #:: LazyList.Empty
diff --git a/scalafix/rules/src/main/scala/fix/Stable.scala b/scalafix/rules/src/main/scala/fix/Stable.scala
diff --git a/scalafix/rules/src/main/scala/fix/UnstableMapValues.scala b/scalafix/rules/src/main/scala/fix/UnstableMapValues.scala
diff --git a/scalafix/rules/src/main/scala/fix/UnstableStreamToLazyListSrc.scala b/scalafix/rules/src/main/scala/fix/UnstableStreamToLazyListSrc.scala
