Map.retain handle functions and partial functions

Author: MasseGuillaume

scalafix/input/src/main/scala/fix/MethodRenames.scala renamed to scalafix/input/src/main/scala/fix/RetainSrc.scala

@@ -5,6 +5,7 @@ package fix
 
 import scala.collection.mutable.Map
 
-object MethodRenames {
-  Map(1 -> 1).retain{ case (x, y) => true }
+class MethodRenames(xs: Map[Int, Int]) {
+  xs.retain((_, _) => true)
+  xs.retain{case (x, y) => true}
 }

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

@@ -0,0 +1,8 @@
+package fix
+
+import scala.collection.mutable.Map
+
+class MethodRenames(xs: Map[Int, Int]) {
+  xs.filterInPlace{case (_, _) => true}
+  xs.filterInPlace{case (x, y) => true}
+}

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

@@ -37,8 +37,19 @@ case class Scalacollectioncompat_NewCollections(index: SemanticdbIndex)
 
   def replaceMutableMap(ctx: RuleCtx) =
     ctx.tree.collect {
-      case retain(t: Name) =>
-        ctx.replaceTree(t, "filterInPlace")
+      case Term.Apply(Term.Select(_, retain(n: Name)), List(_: Term.PartialFunction)) =>
+        ctx.replaceTree(n, "filterInPlace")
+
+      case Term.Apply(Term.Select(_, retain(n: Name)), List(_: Term.Function)) =>
+        (for {
+          name <- n.tokens.lastOption
+          open <- ctx.tokenList.find(name)(t => t.is[Token.LeftParen])
+          close <- ctx.matchingParens.close(open.asInstanceOf[Token.LeftParen])
+        } yield
+          ctx.replaceToken(open, "{case ") +
+          ctx.replaceToken(close, "}") +
+          ctx.replaceTree(n, "filterInPlace")  
+        ).asPatch   
     }.asPatch
 
   def replaceToList(ctx: RuleCtx) =