Dont insert compat for iterable

scala · Jul 20, 2018 · a70886d · a70886d
1 parent 75e3881
commit a70886d
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/scalafix/rules/src/main/scala/fix/Stable212Base.scala b/scalafix/rules/src/main/scala/fix/Stable212Base.scala
@@ -45,17 +45,21 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
   val traversable = exact(
     "_root_.scala.package.Traversable#",
     "_root_.scala.collection.Traversable#",
-    "_root_.scala.package.Iterable#",
-    "_root_.scala.collection.Iterable#"
   )
 
   // == Rules ==
-
   def replaceIterableSameElements(ctx: RuleCtx): Patch = {
-    ctx.tree.collect {
-      case Term.Apply(Term.Select(lhs, iterableSameElement(_)), List(_)) =>
-        ctx.addRight(lhs, ".iterator")
-    }.asPatch
+    val sameElements =
+      ctx.tree.collect {
+        case Term.Apply(Term.Select(lhs, iterableSameElement(_)), List(_)) =>
+          ctx.addRight(lhs, ".iterator")
+      }.asPatch
+
+    val compatImport =
+      if(sameElements.nonEmpty) addCompatImport(ctx)
+      else Patch.empty
+
+    sameElements + compatImport
   }