Merge pull request #124 from MasseGuillaume/java-conversion-take2

Fix missing mapAsJavaMap case

Author: julienrf

scalafix/input/src/main/scala/fix/conversions/JavaConversionsGlobalImportSrc.scala

@@ -45,7 +45,7 @@ object JavaConversionsGlobalImportSrc extends JavaConversionsDataSrc {
   m.Map(1 -> 1): ju.Dictionary[Int, Int]
 
   // mapAsJavaMap
-  m.Map(1 -> 1): ju.Map[Int, Int]
+  Map(1 -> 1): ju.Map[Int, Int]
 
   // mapAsJavaConcurrentMap
   concMap: juc.ConcurrentMap[Int, Int]

scalafix/input/src/main/scala/fix/conversions/JavaConversionsSpecificImportSrc.scala

@@ -80,7 +80,7 @@ object JavaConversionsSpecificImportSrc extends JavaConversionsDataSrc {
   // mapAsJavaMap
   {
     import JavaConversions.mapAsJavaMap
-    m.Map(1 -> 1): ju.Map[Int, Int]
+    Map(1 -> 1): ju.Map[Int, Int]
   }
 
   // mapAsJavaConcurrentMap

scalafix/output/src/main/scala/fix/conversions/JavaConversionsGlobalImportSrc.scala

@@ -45,7 +45,7 @@ object JavaConversionsGlobalImportSrc extends JavaConversionsDataSrc {
   m.Map(1 -> 1).asJavaDictionary: ju.Dictionary[Int, Int]
 
   // mapAsJavaMap
-  m.Map(1 -> 1).asJava: ju.Map[Int, Int]
+  Map(1 -> 1).asJava: ju.Map[Int, Int]
 
   // mapAsJavaConcurrentMap
   concMap.asJava: juc.ConcurrentMap[Int, Int]

scalafix/output/src/main/scala/fix/conversions/JavaConversionsSpecificImportSrc.scala

@@ -68,7 +68,7 @@ object JavaConversionsSpecificImportSrc extends JavaConversionsDataSrc {
 
   // mapAsJavaMap
   {
-    m.Map(1 -> 1).asJava: ju.Map[Int, Int]
+    Map(1 -> 1).asJava: ju.Map[Int, Int]
   }
 
   // mapAsJavaConcurrentMap

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

@@ -435,15 +435,17 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
         "_root_.scala.collection.convert.LowPriorityWrapAsJava#mutableSetAsJavaSet(Lscala/collection/mutable/Set;)Ljava/util/Set;.",
         "_root_.scala.collection.convert.LowPriorityWrapAsJava#seqAsJavaList(Lscala/collection/Seq;)Ljava/util/List;.",
         "_root_.scala.collection.convert.LowPriorityWrapAsJava#setAsJavaSet(Lscala/collection/Set;)Ljava/util/Set;.",
+        "_root_.scala.collection.convert.WrapAsJava#`deprecated asJavaIterable`(Lscala/collection/Iterable;)Ljava/lang/Iterable;.",
         "_root_.scala.collection.convert.WrapAsJava#`deprecated asJavaIterator`(Lscala/collection/Iterator;)Ljava/util/Iterator;.",
         "_root_.scala.collection.convert.WrapAsJava#`deprecated bufferAsJavaList`(Lscala/collection/mutable/Buffer;)Ljava/util/List;.",
         "_root_.scala.collection.convert.WrapAsJava#`deprecated mapAsJavaConcurrentMap`(Lscala/collection/concurrent/Map;)Ljava/util/concurrent/ConcurrentMap;.",
+        "_root_.scala.collection.convert.WrapAsJava#`deprecated mapAsJavaMap`(Lscala/collection/Map;)Ljava/util/Map;.",
         "_root_.scala.collection.convert.WrapAsJava#`deprecated mutableMapAsJavaMap`(Lscala/collection/mutable/Map;)Ljava/util/Map;.",
         "_root_.scala.collection.convert.WrapAsJava#`deprecated mutableMapAsJavaMap`(Lscala/collection/mutable/Map;)Ljava/util/Map;.",
         "_root_.scala.collection.convert.WrapAsJava#`deprecated mutableSeqAsJavaList`(Lscala/collection/mutable/Seq;)Ljava/util/List;.",
         "_root_.scala.collection.convert.WrapAsJava#`deprecated mutableSetAsJavaSet`(Lscala/collection/mutable/Set;)Ljava/util/Set;.",
         "_root_.scala.collection.convert.WrapAsJava#`deprecated seqAsJavaList`(Lscala/collection/Seq;)Ljava/util/List;.",
-        "_root_.scala.collection.convert.WrapAsJava#`deprecated setAsJavaSet`(Lscala/collection/Set;)Ljava/util/Set;.",
+        "_root_.scala.collection.convert.WrapAsJava#`deprecated setAsJavaSet`(Lscala/collection/Set;)Ljava/util/Set;."
       ),
       "asJavaEnumeration" -> List(
         "_root_.scala.collection.convert.LowPriorityWrapAsJava#asJavaEnumeration(Lscala/collection/Iterator;)Ljava/util/Enumeration;.",
@@ -540,21 +542,20 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
 
     val patch =
       ctx.tree.collect {
+        // ex: juSet: Set[Int]
         case tree @ ImplicitConversion(asX) =>
           ctx.addRight(tree, "." + asX)
 
+        // ex: mapAsScalaMap(juMap)
+        case ap @ Term.Apply(ExplicitConversion(asX), List(rhs)) =>
+          explicitToAsX(ap, rhs, asX)
+
         case Importer(JavaConversions(_), importees) =>
           importees.map(ctx.removeImportee).asPatch
 
         case i @ Importee.Name(JavaConversionsImport(_)) =>
           ctx.removeImportee(i)
 
-        case ap @ Term.Apply(Term.Select(_, ExplicitConversion(asX)), List(rhs)) =>
-          explicitToAsX(ap, rhs, asX)
-
-        case ap @ Term.Apply(ExplicitConversion(asX), List(rhs)) =>
-          explicitToAsX(ap, rhs, asX)
-
       }.asPatch
 
     val converterImport =