Skip to content

Commit bb2d90c

Browse files
Dont insert compat for iterable
1 parent 905b1fe commit bb2d90c

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

scalafix/rules/src/main/scala/fix/Stable212Base.scala

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
4545
val traversable = exact(
4646
"_root_.scala.package.Traversable#",
4747
"_root_.scala.collection.Traversable#",
48-
"_root_.scala.package.Iterable#",
49-
"_root_.scala.collection.Iterable#"
5048
)
5149

5250
object Breakout {
@@ -236,10 +234,17 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
236234
}
237235

238236
def replaceIterableSameElements(ctx: RuleCtx): Patch = {
239-
ctx.tree.collect {
240-
case Term.Apply(Term.Select(lhs, iterableSameElement(_)), List(_)) =>
241-
ctx.addRight(lhs, ".iterator")
242-
}.asPatch
237+
val sameElements =
238+
ctx.tree.collect {
239+
case Term.Apply(Term.Select(lhs, iterableSameElement(_)), List(_)) =>
240+
ctx.addRight(lhs, ".iterator")
241+
}.asPatch
242+
243+
val compatImport =
244+
if(sameElements.nonEmpty) addCompatImport(ctx)
245+
else Patch.empty
246+
247+
sameElements + compatImport
243248
}
244249

245250

0 commit comments

Comments
 (0)