fixup! b69c89a Added back type information to the macros

Author: Jaden Peterson

macros/src/main/scala/enumeratum/compat/EnumMacros.scala

@@ -11,7 +11,9 @@ object EnumMacros {
 
   /** Finds any [A] in the current scope and returns an expression for a list of them
     */
-  def findValuesImpl[A: c.WeakTypeTag](c: Context): c.Tree = {
+  def findValuesImpl[A: c.WeakTypeTag](
+      c: Context
+  )(implicit typeTag: c.WeakTypeTag[IndexedSeq[A]]): c.Expr[IndexedSeq[A]] = {
     import c.universe._
     val typeSymbol = weakTypeOf[A].typeSymbol
     validateType(c)(typeSymbol)
@@ -161,22 +163,26 @@ object EnumMacros {
   @SuppressWarnings(Array("org.wartremover.warts.AsInstanceOf"))
   private[enumeratum] def buildSeqExpr[A: c.WeakTypeTag](c: Context)(
       subclassSymbols: Seq[c.universe.Symbol]
-  ): c.Tree = {
+  )(implicit typeTag: c.WeakTypeTag[IndexedSeq[A]]) = {
     import c.universe._
     val resultType = weakTypeOf[A]
     val indexedSeq = Ident(c.mirror.staticModule(classOf[IndexedSeq[A]].getName))
     if (subclassSymbols.isEmpty) {
-      TypeApply(
-        Select(indexedSeq, ContextUtils.termName(c)("empty")),
-        List(TypeTree(resultType))
-      )
-    } else {
-      Apply(
+      c.Expr[IndexedSeq[A]](
         TypeApply(
-          Select(indexedSeq, ContextUtils.termName(c)("apply")),
+          Select(indexedSeq, ContextUtils.termName(c)("empty")),
           List(TypeTree(resultType))
-        ),
-        subclassSymbols.map(Ident(_)).toList
+        )
+      )
+    } else {
+      c.Expr[IndexedSeq[A]](
+        Apply(
+          TypeApply(
+            Select(indexedSeq, ContextUtils.termName(c)("apply")),
+            List(TypeTree(resultType))
+          ),
+          subclassSymbols.map(Ident(_)).toList
+        )
       )
     }
   }

macros/src/main/scala/enumeratum/compat/ValueEnumMacros.scala

@@ -16,7 +16,9 @@ object ValueEnumMacros {
     */
   def findIntValueEntriesImpl[ValueEntryType: c.WeakTypeTag](
       c: Context
-  ): c.Tree = {
+  )(implicit
+      typeTag: c.WeakTypeTag[IndexedSeq[ValueEntryType]]
+  ): c.Expr[IndexedSeq[ValueEntryType]] = {
     findValueEntriesImpl[ValueEntryType, ContextUtils.CTInt, Int](c)(identity)
   }
 
@@ -26,7 +28,9 @@ object ValueEnumMacros {
     */
   def findLongValueEntriesImpl[ValueEntryType: c.WeakTypeTag](
       c: Context
-  ): c.Tree = {
+  )(implicit
+      typeTag: c.WeakTypeTag[IndexedSeq[ValueEntryType]]
+  ): c.Expr[IndexedSeq[ValueEntryType]] = {
     findValueEntriesImpl[ValueEntryType, ContextUtils.CTLong, Long](c)(identity)
   }
 
@@ -39,7 +43,9 @@ object ValueEnumMacros {
     */
   def findShortValueEntriesImpl[ValueEntryType: c.WeakTypeTag](
       c: Context
-  ): c.Tree = {
+  )(implicit
+      typeTag: c.WeakTypeTag[IndexedSeq[ValueEntryType]]
+  ): c.Expr[IndexedSeq[ValueEntryType]] = {
     findValueEntriesImpl[ValueEntryType, ContextUtils.CTInt, Short](c)(
       _.toShort
     ) // do a transform because there is no such thing as Short literals
@@ -53,7 +59,9 @@ object ValueEnumMacros {
     */
   def findStringValueEntriesImpl[ValueEntryType: c.WeakTypeTag](
       c: Context
-  ): c.Tree = {
+  )(implicit
+      typeTag: c.WeakTypeTag[IndexedSeq[ValueEntryType]]
+  ): c.Expr[IndexedSeq[ValueEntryType]] = {
     findValueEntriesImpl[ValueEntryType, String, String](c)(identity)
   }
 
@@ -65,7 +73,9 @@ object ValueEnumMacros {
     */
   def findByteValueEntriesImpl[ValueEntryType: c.WeakTypeTag](
       c: Context
-  ): c.Tree = {
+  )(implicit
+      typeTag: c.WeakTypeTag[IndexedSeq[ValueEntryType]]
+  ): c.Expr[IndexedSeq[ValueEntryType]] = {
     findValueEntriesImpl[ValueEntryType, ContextUtils.CTInt, Byte](c)(_.toByte)
   }
 
@@ -77,7 +87,9 @@ object ValueEnumMacros {
     */
   def findCharValueEntriesImpl[ValueEntryType: c.WeakTypeTag](
       c: Context
-  ): c.Tree = {
+  )(implicit
+      typeTag: c.WeakTypeTag[IndexedSeq[ValueEntryType]]
+  ): c.Expr[IndexedSeq[ValueEntryType]] = {
     findValueEntriesImpl[ValueEntryType, ContextUtils.CTChar, Char](c)(identity)
   }
 
@@ -89,7 +101,9 @@ object ValueEnumMacros {
       ProcessedValue
   ](c: Context)(
       processFoundValues: ValueType => ProcessedValue
-  ): c.Tree = {
+  )(implicit
+      typeTag: c.WeakTypeTag[IndexedSeq[ValueEntryType]]
+  ): c.Expr[IndexedSeq[ValueEntryType]] = {
     import c.universe._
     val typeSymbol = weakTypeOf[ValueEntryType].typeSymbol
     EnumMacros.validateType(c)(typeSymbol)