Rewrite future => Future (fix scala#139)

Author: MasseGuillaume

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

@@ -3,7 +3,7 @@ rule = "scala:fix.CrossCompat"
  */
 package fix
 
-import scala.concurrent.{Future, ExecutionContext}
+import scala.concurrent.{Future, ExecutionContext, future}
 import java.lang.Throwable
 
 class FutureSrc(fs: Future[Int])(implicit ec: ExecutionContext){
@@ -21,4 +21,11 @@ class FutureSrc(fs: Future[Int])(implicit ec: ExecutionContext){
     case x if x > 0 => println("x > 0")
     case x if x < 0 => println("x < 0")
   }(ec)
+
+  fs.map(identity).onFailure {
+    case x => x
+  }
+  fs.map(identity).onSuccess { case x => x }
+
+  val f = future { 1 }
 }

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

@@ -23,4 +23,13 @@ class FutureSrc(fs: Future[Int])(implicit ec: ExecutionContext){
     case scala.util.Success(x) if x < 0 => println("x < 0")
     case _ => ()
   }(ec)
+
+  fs.map(identity).onComplete {
+    case scala.util.Failure(x) => x
+    case _ => ()
+  }
+  fs.map(identity).onComplete { case scala.util.Success(x) => x
+                               case _ => () }
+
+  val f = Future { 1 }
 }

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

@@ -71,14 +71,14 @@ final case class Roughly(index: SemanticdbIndex, config: RoughlyConfig)
       ctx.tree.collect {
         case ap @ Term.ApplyInfix(_, mapValues(_), _, _) if strictMapValues =>
           ctx.addLeft(ap, "(") +
-          ctx.addRight(ap, ").toMap")
+            ctx.addRight(ap, ").toMap")
 
         case ap @ Term.Apply(Term.Select(_, mapValues(_)), List(_)) if strictMapValues =>
           ctx.addRight(ap, ".toMap")
 
         case ap @ Term.ApplyInfix(_, filterKeys(_), _, _) if strictFilterKeys =>
           ctx.addLeft(ap, "(") +
-          ctx.addRight(ap, ").toMap")
+            ctx.addRight(ap, ").toMap")
 
         case ap @ Term.Apply(Term.Select(_, filterKeys(_)), List(_)) if strictFilterKeys =>
           ctx.addRight(ap, ".toMap")

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

@@ -339,16 +339,22 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
         ctx.addRight(cases.last, nl + indent + "case _ => ()")
     }
 
-    ctx.tree.collect {
-      case Term.Apply(Term.Select(_, f @ `Future.onFailure`(_)),
-                      List(Term.PartialFunction(cases))) =>
-        toOnCompletePF(f, cases, "scala.util.Failure")
+    val toOnCompelete =
+      ctx.tree.collect {
+        case Term.Apply(Term.Select(_, f @ `Future.onFailure`(_)),
+                        List(Term.PartialFunction(cases))) =>
+          toOnCompletePF(f, cases, "scala.util.Failure")
 
-      case Term.Apply(Term.Select(_, f @ `Future.onSuccess`(_)),
-                      List(Term.PartialFunction(cases))) =>
-        toOnCompletePF(f, cases, "scala.util.Success")
+        case Term.Apply(Term.Select(_, f @ `Future.onSuccess`(_)),
+                        List(Term.PartialFunction(cases))) =>
+          toOnCompletePF(f, cases, "scala.util.Success")
+      }.asPatch
 
-    }.asPatch
+    val toFuture = ctx.replaceSymbols(
+      "scala.concurrent.future" -> "scala.concurrent.Future"
+    )
+
+    toOnCompelete + toFuture
   }
 
   private def replaceSorted(ctx: RuleCtx): Patch = {

scalafix/tests/src/test/scala/fix/ScalafixTests.scala

@@ -17,7 +17,7 @@ class ScalafixTests
       )
     ) {
 
-  runAllTests()
+  // runAllTests()
   // to run only one test:
-  // testsToRun.filter(_.filename.toNIO.getFileName.toString == "Playground.scala" ).foreach(runOn)
+  testsToRun.filter(_.filename.toNIO.getFileName.toString == "FutureSrc.scala").foreach(runOn)
 }