Merge pull request #1250 from pomadchin/fix/generic

Fix Generic materialization for type aliases
milessabin · Mar 20, 2022 · d8516ce · d8516ce
2 parents 3634e62 + ef6f151
commit d8516ce
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/core/src/main/scala/shapeless/generic.scala b/core/src/main/scala/shapeless/generic.scala
@@ -937,7 +937,7 @@ class GenericMacros(val c: whitebox.Context) extends CaseClassMacros {
   def materialize[T: WeakTypeTag, R]: Tree = mkGeneric[T]
 
   def mkGeneric[T: WeakTypeTag]: Tree = {
-    val tpe = weakTypeOf[T]
+    val tpe = weakTypeOf[T].dealias
     if (isReprType(tpe))
       abort("No Generic instance available for HList or Coproduct")
 

diff --git a/core/src/test/scala/shapeless/generic.scala b/core/src/test/scala/shapeless/generic.scala
@@ -1371,3 +1371,19 @@ object CaseClassWithImplicits {
   def shouldCompile[T: ATypeClass]
   : Generic.Aux[ACaseClassWithContextBound[T], HNil] = Generic[ACaseClassWithContextBound[T]]
 }
+
+object AliasMaterialization {
+  // https://github.com/milessabin/shapeless/issues/1248
+  case class TX2[A, B](a: A, b: B)
+  case class TX3[A, B, C](a: A, b: B, c: C)
+
+  def shouldCompile1[A, B](data: TX2[A, B])(implicit g: Generic[TX2[A, B]]): Unit = {}
+
+  shouldCompile1(TX2[Int, Boolean](1, true))
+
+  type TTX3[A, B] = TX3[Long, Int, TX2[A, B]]
+
+  def shouldCompile2[A, B](data: TTX3[A, B])(implicit g: Generic[TTX3[A, B]]): Unit = {}
+
+  shouldCompile2(TX3(1L, 1, TX2(1, true)))
+}