Add support for subtyping

softwaremill · Oct 16, 2021 · 4b70ca2 · 4b70ca2
1 parent 4232a19
commit 4b70ca2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 24 deletions.
diff --git a/...Cats/src/main/scala/com/softwaremill/macwire/auto/catssupport/MacwireAutoCatsMacros.scala b/...Cats/src/main/scala/com/softwaremill/macwire/auto/catssupport/MacwireAutoCatsMacros.scala
@@ -111,10 +111,12 @@ object MacwireCatsEffectMacros {
     log(s"instances: [${instances.mkString(", ")}]")
     log(s"factory methods: [${factoryMethods.mkString(", ")}]")
 
-    def findInstance(t: Type): Option[Instance] = instances.get(t)
+    def doFind[T <: Provider](values: Map[Type, T])(tpe: Type): Option[T] = values.find {case (t, _) => t <:< tpe}.map(_._2)
 
-    def findResource(t: Type): Option[Resource] = resources.get(t)
-    def findFactoryMethod(t: Type): Option[FactoryMethod] = factoryMethods.get(t)
+    def findInstance(t: Type): Option[Instance] = doFind(instances)(t)
+
+    def findResource(t: Type): Option[Resource] = doFind(resources)(t)
+    def findFactoryMethod(t: Type): Option[FactoryMethod] = doFind(factoryMethods)(t)
 
     def isWireable(tpe: Type): Boolean = {
       val name = tpe.typeSymbol.fullName

diff --git a/macrosAutoCatsTests/src/test/resources/test-cases/todo/subtypeParameter.success b/macrosAutoCatsTests/src/test/resources/test-cases/todo/subtypeParameter.success