Rewrite Map.zip -> Map.zip.toMap

Author: MasseGuillaume

scalafix/input/src/main/scala/fix/SetMapSrc.scala

@@ -9,4 +9,5 @@ class SetMapSrc(set: Set[Int], map: Map[Int, Int]) {
   (set + (2, 3)).map(x => x)
   set + (2, 3) - 4
   map.mapValues(_ + 1)
+  map.zip(List())
 }

scalafix/output/src/main/scala/fix/SetMapSrc.scala

@@ -9,4 +9,5 @@ class SetMapSrc(set: Set[Int], map: Map[Int, Int]) {
   (set + 2 + 3).map(x => x)
   set + 2 + 3 - 4
   map.mapValues(_ + 1).toMap
+  map.zip(List()).toMap
 }

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

@@ -77,11 +77,17 @@ case class Scalacollectioncompat_newcollections(index: SemanticdbIndex)
       Symbol("_root_.scala.collection.mutable.SetLike.retain.")
     )
 
+
   val arrayBuilderMake = 
     SymbolMatcher.normalized(
       Symbol("_root_.scala.collection.mutable.ArrayBuilder.make(Lscala/reflect/ClassTag;)Lscala/collection/mutable/ArrayBuilder;.")
     )
 
+  val mapZip = 
+    SymbolMatcher.exact(
+      Symbol("_root_.scala.collection.IterableLike#zip(Lscala/collection/GenIterable;Lscala/collection/generic/CanBuildFrom;)Ljava/lang/Object;.")
+    )
+
   def replaceMutableSet(ctx: RuleCtx) =
     ctx.tree.collect {
       case retainSet(n: Name) =>
@@ -254,10 +260,16 @@ case class Scalacollectioncompat_newcollections(index: SemanticdbIndex)
       case ap @ Term.Apply(at @ Term.ApplyType(Term.Select(lhs, arrayBuilderMake(_)), args), Nil) =>
         val extraParens =
           ap.tokens.slice(at.tokens.size, ap.tokens.size)
-
         ctx.removeTokens(extraParens)
     }.asPatch
   }
+  
+  def replaceMapZip(ctx: RuleCtx): Patch = {
+    ctx.tree.collect {
+      case ap @ Term.Apply(Term.Select(_, mapZip(_)), List(_)) =>
+        ctx.addRight(ap, ".toMap")
+    }.asPatch
+  }
 
   def replaceMapMapValues(ctx: RuleCtx): Patch = {
     ctx.tree.collect {
@@ -280,7 +292,7 @@ case class Scalacollectioncompat_newcollections(index: SemanticdbIndex)
       replaceMutMapUpdated(ctx) +
       replaceIterableSameElements(ctx) +
       replaceArrayBuilderMake(ctx) +
+      replaceMapZip(ctx) +
       replaceMapMapValues(ctx)
-
   }
 }