Merge pull request #55 from MasseGuillaume/mut-map-updated

Rewrite mutable.Map.updated

Author: julienrf

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

@@ -9,4 +9,5 @@ class MutSetMapSrc(map: mutable.Map[Int, Int], set: mutable.Set[Int]) {
   set + 2
   map + (2 -> 3)
   (set + 2).size
+  map.updated(1, 3)
 }

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

@@ -9,4 +9,5 @@ class MutSetMapSrc(map: mutable.Map[Int, Int], set: mutable.Set[Int]) {
   set.clone() += 2
   map.clone() += (2 -> 3)
   (set.clone() += 2).size
+  map.clone() += ((1, 3))
 }

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

@@ -41,6 +41,10 @@ case class Scalacollectioncompat_newcollections(index: SemanticdbIndex)
   val mutMapPlus = SymbolMatcher.exact(
     Symbol("_root_.scala.collection.mutable.MapLike#`+`(Lscala/Tuple2;)Lscala/collection/mutable/Map;.")
   )
+  val mutMapUpdate = 
+    SymbolMatcher.exact(
+      Symbol("_root_.scala.collection.mutable.MapLike#updated(Ljava/lang/Object;Ljava/lang/Object;)Lscala/collection/mutable/Map;.")
+    )
 
   def foldSymbol(isLeft: Boolean): SymbolMatcher = {
     val op = 
@@ -212,6 +216,16 @@ case class Scalacollectioncompat_newcollections(index: SemanticdbIndex)
     }.asPatch
   }
 
+  def replaceMutMapUpdated(ctx: RuleCtx): Patch = {
+    ctx.tree.collect {
+      case Term.Apply(Term.Select(a, up @ mutMapUpdate(_)), List(k, v)) => {
+        ctx.addRight(up, "clone() += (") +
+        ctx.removeTokens(up.tokens) +
+        ctx.addRight(v, ")")
+      }
+    }.asPatch
+  }
+
   override def fix(ctx: RuleCtx): Patch = {
     // println(ctx.index.database)
 
@@ -224,6 +238,7 @@ case class Scalacollectioncompat_newcollections(index: SemanticdbIndex)
       replaceMutableSet(ctx) +
       replaceSymbolicFold(ctx) +
       replaceSetMapPlus2(ctx) +
-      replaceMutSetMapPlus(ctx)
+      replaceMutSetMapPlus(ctx) +
+      replaceMutMapUpdated(ctx)
   }
 }