aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Pretty <jon.pretty@propensive.com>2017-11-10 15:16:43 +0000
committerJon Pretty <jon.pretty@propensive.com>2017-11-10 15:16:43 +0000
commite4ba86981d70ed96d56fa998b5c905a1720f4db2 (patch)
treeaa249c1759b785ba733c4d6f66c17e5ef8f355c2
parenta19b4d22b4caffbed551182b20657588b470230b (diff)
downloadmagnolia-e4ba86981d70ed96d56fa998b5c905a1720f4db2.tar.gz
magnolia-e4ba86981d70ed96d56fa998b5c905a1720f4db2.tar.bz2
magnolia-e4ba86981d70ed96d56fa998b5c905a1720f4db2.zip
Finished dealiasing type constructor type
-rw-r--r--core/src/main/scala/magnolia.scala11
1 files changed, 8 insertions, 3 deletions
diff --git a/core/src/main/scala/magnolia.scala b/core/src/main/scala/magnolia.scala
index f7e9b0e..6be8ed0 100644
--- a/core/src/main/scala/magnolia.scala
+++ b/core/src/main/scala/magnolia.scala
@@ -71,11 +71,16 @@ object Magnolia {
val magnoliaObj = q"$magnoliaPkg.Magnolia"
val arrayCls = tq"_root_.scala.Array"
- val typeDefinitions =
- c.prefix.tree.tpe.baseClasses.flatMap(_.asType.toType.decls).filter(_.isType)
+ val prefixType = c.prefix.tree.tpe
+
+ val typeDefs = prefixType.baseClasses.flatMap { cls =>
+ cls.asType.toType.decls.filter(_.isType).find(_.name.toString == "Typeclass").map { tpe =>
+ tpe.asType.toType.asSeenFrom(prefixType, cls)
+ }
+ }
val typeConstructorOpt =
- typeDefinitions.find(_.name.toString == "Typeclass").map(_.asType.toType.typeConstructor)
+ typeDefs.headOption.map(_.typeConstructor)
val typeConstructor = typeConstructorOpt.getOrElse {
c.abort(c.enclosingPosition, "magnolia: the derivation object does not define the Typeclass "+