mend

lloydmeta · Jun 23, 2024 · a1cde16 · a1cde16
1 parent c7e52d0
commit a1cde16
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/macros/src/main/scala-3/enumeratum/ValueEnumMacros.scala b/macros/src/main/scala-3/enumeratum/ValueEnumMacros.scala
@@ -138,9 +138,13 @@ In SBT settings:
 
     val valueRepr = TypeRepr.of[ValueType]
 
-    val valueParamIndex = tpeSym.primaryConstructor.paramSymss.flatten.zipWithIndex.collectFirst {
-      case (p, i) if p.name == "value" => i
-    }
+    val valueParamIndex = tpeSym.primaryConstructor.paramSymss
+      .filterNot(_.exists(_.isType))
+      .flatten
+      .zipWithIndex
+      .collectFirst {
+        case (p, i) if p.name == "value" => i
+      }
 
     type IsValue[T <: ValueType] = T
 
@@ -175,11 +179,8 @@ In SBT settings:
                   .flatMap(_.lift(valueParamIndex.getOrElse(-1)).collect { case ConstVal(const) =>
                     const
                   })
-                fromCtor
-                  .orElse(statements.collectFirst { case ConstVal(v) => v })
-                  .flatMap { const =>
-                    cls.unapply(const.value)
-                  }
+                def fromBody = statements.collectFirst { case ConstVal(v) => v }
+                fromCtor.orElse(fromBody).flatMap { const => cls.unapply(const.value) }
               }
               case _ =>
                 Option.empty[ValueType]

diff --git a/macros/src/test/scala/enumeratum/CompilationSpec.scala b/macros/src/test/scala/enumeratum/CompilationSpec.scala
@@ -136,3 +136,9 @@ object F {
   case object F4 extends F(value = 4, "mike")
 
 }
+
+sealed abstract class G(val name: String, val value: Int)
+object G {
+  val values = FindValEnums[G]
+  case object G1 extends G("gerald", 1)
+}