Skip to content

Commit cac7598

Browse files
Fix missing mapAsJavaMap case
1 parent 8b34b8d commit cac7598

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ object JavaConversionsGlobalImportSrc extends JavaConversionsDataSrc {
4545
m.Map(1 -> 1): ju.Dictionary[Int, Int]
4646

4747
// mapAsJavaMap
48-
m.Map(1 -> 1): ju.Map[Int, Int]
48+
Map(1 -> 1): ju.Map[Int, Int]
4949

5050
// mapAsJavaConcurrentMap
5151
concMap: juc.ConcurrentMap[Int, Int]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ object JavaConversionsSpecificImportSrc extends JavaConversionsDataSrc {
8080
// mapAsJavaMap
8181
{
8282
import JavaConversions.mapAsJavaMap
83-
m.Map(1 -> 1): ju.Map[Int, Int]
83+
Map(1 -> 1): ju.Map[Int, Int]
8484
}
8585

8686
// mapAsJavaConcurrentMap

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ object JavaConversionsGlobalImportSrc extends JavaConversionsDataSrc {
4545
m.Map(1 -> 1).asJavaDictionary: ju.Dictionary[Int, Int]
4646

4747
// mapAsJavaMap
48-
m.Map(1 -> 1).asJava: ju.Map[Int, Int]
48+
Map(1 -> 1).asJava: ju.Map[Int, Int]
4949

5050
// mapAsJavaConcurrentMap
5151
concMap.asJava: juc.ConcurrentMap[Int, Int]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ object JavaConversionsSpecificImportSrc extends JavaConversionsDataSrc {
6868

6969
// mapAsJavaMap
7070
{
71-
m.Map(1 -> 1).asJava: ju.Map[Int, Int]
71+
Map(1 -> 1).asJava: ju.Map[Int, Int]
7272
}
7373

7474
// mapAsJavaConcurrentMap

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -440,15 +440,17 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
440440
"_root_.scala.collection.convert.LowPriorityWrapAsJava#mutableSetAsJavaSet(Lscala/collection/mutable/Set;)Ljava/util/Set;.",
441441
"_root_.scala.collection.convert.LowPriorityWrapAsJava#seqAsJavaList(Lscala/collection/Seq;)Ljava/util/List;.",
442442
"_root_.scala.collection.convert.LowPriorityWrapAsJava#setAsJavaSet(Lscala/collection/Set;)Ljava/util/Set;.",
443+
"_root_.scala.collection.convert.WrapAsJava#`deprecated asJavaIterable`(Lscala/collection/Iterable;)Ljava/lang/Iterable;.",
443444
"_root_.scala.collection.convert.WrapAsJava#`deprecated asJavaIterator`(Lscala/collection/Iterator;)Ljava/util/Iterator;.",
444445
"_root_.scala.collection.convert.WrapAsJava#`deprecated bufferAsJavaList`(Lscala/collection/mutable/Buffer;)Ljava/util/List;.",
445446
"_root_.scala.collection.convert.WrapAsJava#`deprecated mapAsJavaConcurrentMap`(Lscala/collection/concurrent/Map;)Ljava/util/concurrent/ConcurrentMap;.",
447+
"_root_.scala.collection.convert.WrapAsJava#`deprecated mapAsJavaMap`(Lscala/collection/Map;)Ljava/util/Map;.",
446448
"_root_.scala.collection.convert.WrapAsJava#`deprecated mutableMapAsJavaMap`(Lscala/collection/mutable/Map;)Ljava/util/Map;.",
447449
"_root_.scala.collection.convert.WrapAsJava#`deprecated mutableMapAsJavaMap`(Lscala/collection/mutable/Map;)Ljava/util/Map;.",
448450
"_root_.scala.collection.convert.WrapAsJava#`deprecated mutableSeqAsJavaList`(Lscala/collection/mutable/Seq;)Ljava/util/List;.",
449451
"_root_.scala.collection.convert.WrapAsJava#`deprecated mutableSetAsJavaSet`(Lscala/collection/mutable/Set;)Ljava/util/Set;.",
450452
"_root_.scala.collection.convert.WrapAsJava#`deprecated seqAsJavaList`(Lscala/collection/Seq;)Ljava/util/List;.",
451-
"_root_.scala.collection.convert.WrapAsJava#`deprecated setAsJavaSet`(Lscala/collection/Set;)Ljava/util/Set;.",
453+
"_root_.scala.collection.convert.WrapAsJava#`deprecated setAsJavaSet`(Lscala/collection/Set;)Ljava/util/Set;."
452454
),
453455
"asJavaEnumeration" -> List(
454456
"_root_.scala.collection.convert.LowPriorityWrapAsJava#asJavaEnumeration(Lscala/collection/Iterator;)Ljava/util/Enumeration;.",
@@ -545,21 +547,20 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
545547

546548
val patch =
547549
ctx.tree.collect {
550+
// ex: juSet: Set[Int]
548551
case tree @ ImplicitConversion(asX) =>
549552
ctx.addRight(tree, "." + asX)
550553

554+
// ex: mapAsScalaMap(juMap)
555+
case ap @ Term.Apply(ExplicitConversion(asX), List(rhs)) =>
556+
explicitToAsX(ap, rhs, asX)
557+
551558
case Importer(JavaConversions(_), importees) =>
552559
importees.map(ctx.removeImportee).asPatch
553560

554561
case i @ Importee.Name(JavaConversionsImport(_)) =>
555562
ctx.removeImportee(i)
556563

557-
case ap @ Term.Apply(Term.Select(_, ExplicitConversion(asX)), List(rhs)) =>
558-
explicitToAsX(ap, rhs, asX)
559-
560-
case ap @ Term.Apply(ExplicitConversion(asX), List(rhs)) =>
561-
explicitToAsX(ap, rhs, asX)
562-
563564
}.asPatch
564565

565566
val converterImport =

0 commit comments

Comments
 (0)