From 6b9f9f797e78f32b135b7cc6bc941e10d073dd7f Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Fri, 6 Dec 2024 18:37:53 +0100
Subject: [PATCH] Add type parameters derived from enum to default param
 getters of enum cases

---
 .../src/dotty/tools/dotc/ast/Desugar.scala    | 19 ++++++++++++-------
 tests/pos/i22137.scala                        |  5 +++++
 2 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 tests/pos/i22137.scala

diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
index 56c153498f87..a95e64e24b85 100644
--- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala
+++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
@@ -694,15 +694,15 @@ object desugar {
     val originalTparams = constr1.leadingTypeParams
     val originalVparamss = asTermOnly(constr1.trailingParamss)
     lazy val derivedEnumParams = enumClass.typeParams.map(derivedTypeParamWithVariance)
-    val impliedTparams =
-      if (isEnumCase) {
+    val enumTParams =
+      if isEnumCase then
         val tparamReferenced = typeParamIsReferenced(
-            enumClass.typeParams, originalTparams, originalVparamss, parents)
-        if (originalTparams.isEmpty && (parents.isEmpty || tparamReferenced))
+          enumClass.typeParams, originalTparams, originalVparamss, parents)
+        if originalTparams.isEmpty && (parents.isEmpty || tparamReferenced) then
           derivedEnumParams.map(tdef => tdef.withFlags(tdef.mods.flags | PrivateLocal))
-        else originalTparams
-      }
-      else originalTparams
+        else Nil
+      else Nil
+    val impliedTparams = enumTParams ++ originalTparams
 
     if mods.is(Trait) then
       for vparams <- originalVparamss; vparam <- vparams do
@@ -735,6 +735,11 @@ object desugar {
         derived.withAnnotations(Nil)
 
     val constr = cpy.DefDef(constr1)(paramss = joinParams(constrTparams, constrVparamss))
+    if enumTParams.nonEmpty then
+      defaultGetters = defaultGetters.map:
+        case ddef: DefDef =>
+          val tParams = enumTParams.map(tparam => toMethParam(tparam, KeepAnnotations.All))
+          cpy.DefDef(ddef)(paramss = joinParams(tParams, ddef.trailingParamss))
 
     val (normalizedBody, enumCases, enumCompanionRef) = {
       // Add constructor type parameters and evidence implicit parameters
diff --git a/tests/pos/i22137.scala b/tests/pos/i22137.scala
new file mode 100644
index 000000000000..b52dd9171146
--- /dev/null
+++ b/tests/pos/i22137.scala
@@ -0,0 +1,5 @@
+enum Parser[+Value]:
+  case Success(value: Value, issues: Seq[Failure] = Seq.empty) extends Parser[Value]
+  case Failure(exception: Throwable)                           extends Parser[Nothing]
+
+val v = Parser.Success(1)
\ No newline at end of file