Align case class unapply under -Yscala2-stdlib

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -735,13 +735,26 @@ object desugar {
               .withMods(appMods) :: Nil
           }
         val unapplyMeth = {
+          def scala2LibCompatUnapplyRhs(unapplyParamName: Name) =
+            assert(arity <= Definitions.MaxTupleArity, "Unexpected case class with tuple larger than 22: "+ cdef.show)
+            val optionApply = Select(Ident(nme.scala), "Option".toTermName)
+            if arity == 1 then Apply(optionApply, Select(Ident(unapplyParamName), nme._1))
+            else
+              val tupleApply = Select(Ident(nme.scala), s"Tuple$arity".toTermName)
+              val members = List.tabulate(arity) { n => Select(Ident(unapplyParamName), s"_${n+1}".toTermName) }
+              Apply(optionApply, Apply(tupleApply, members))
+
           val hasRepeatedParam = constrVparamss.head.exists {
             case ValDef(_, tpt, _) => isRepeated(tpt)
           }
           val methName = if (hasRepeatedParam) nme.unapplySeq else nme.unapply
           val unapplyParam = makeSyntheticParameter(tpt = classTypeRef)
-          val unapplyRHS = if (arity == 0) Literal(Constant(true)) else Ident(unapplyParam.name)
+          val unapplyRHS =
+            if (arity == 0) Literal(Constant(true))
+            else if ctx.settings.Yscala2Stdlib.value then scala2LibCompatUnapplyRhs(unapplyParam.name)
+            else Ident(unapplyParam.name)
           val unapplyResTp = if (arity == 0) Literal(Constant(true)) else TypeTree()
+
           DefDef(
             methName,
             joinParams(derivedTparams, (unapplyParam :: Nil) :: Nil),

project/MiMaFilters.scala

@@ -74,9 +74,6 @@ object MiMaFilters {
       // trait $init$
       ProblemFilters.exclude[DirectMissingMethodProblem]("scala.*.$init$"),
 
-      // Case class unapply
-      ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.*.unapply"),
-
       // Value class extension methods
       ProblemFilters.exclude[DirectMissingMethodProblem]("scala.*$extension"),
       ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.*$extension"),
@@ -188,9 +185,6 @@ object MiMaFilters {
       // Issue #17519: we do not set final on the default methods of final copy method.
       ProblemFilters.exclude[FinalMethodProblem]("scala.collection.immutable.Range.copy$default$*"),
 
-      // Case class unapply
-      ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.*.unapply"),
-
       // Value class extension methods
       ProblemFilters.exclude[DirectMissingMethodProblem]("scala.*$extension"),
       ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.*$extension"),

stdlib-2_13-bootstrapped/test/Main.scala

@@ -1,5 +1,7 @@
 package hello
 
+import scala.util.Right
+
 enum Color:
   case Red, Green, Blue
 
@@ -9,4 +11,16 @@ object HelloWorld:
     println(Color.Red)
     println(Color.Green)
     println(Color.Blue)
+
+    testScala2UnapplySignatures()
+  }
+
+  def testScala2UnapplySignatures() = {
+    val _: Option[Int] = Some.unapply(Some(1))
+    val _: Option[Int] = Right.unapply(Right(1))
+    val _: Option[(Int, List[Int])] = ::.unapply(::(1, Nil))
+
+    val _: Option[Int] = Tuple1.unapply(Tuple1(1))
+    val _: Option[(Int, Int)] = Tuple2.unapply((1, 2))
+    val _: Option[(Int, Int, Int)] = Tuple3.unapply((1, 2, 3))
   }