separate the two type argument lists in an extension unapply method

move test cases to pos-macros
split up test cases
add test cases for two argument lists

Author: gorilskij

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -208,18 +208,28 @@ object Inliner {
     val cls = newNormalizedClassSymbol(ctx.owner, tpnme.ANON_CLASS, Synthetic | Final, List(defn.ObjectType), coord = sym.coord)
     val constr = newConstructor(cls, Synthetic, Nil, Nil, coord = sym.coord).entered
 
-    val targs = fun match
-      case TypeApply(_, targs) => targs
-      case _ => Nil
-
-    val unapplyInfo = sym.info match
-      case info: PolyType => info.instantiate(targs.map(_.tpe)) match
+    val (targs1, targs2) = fun match
+      // extension [T] (x: X) def unapply[U](y: Y)
+      case TypeApply(Apply(TypeApply(_, targs1), _), targs2) => (targs1, targs2)
+      // def unapply[U](y: Y)
+      case TypeApply(_, targs) => (targs, Nil)
+      // extension [T] (x: X) def unapply(y: Y)
+      case Apply(TypeApply(_, targs1), _) => (targs1, Nil)
+      // def unapply(y: Y)
+      case _ => (Nil, Nil)
+
+    def extensionInfo(info: Type, targs: List[Tree]): Type =
+      info match
         case MethodTpe(_, _, rt: PolyType) => rt.instantiate(targs.map(_.tpe))
-        case MethodTpe(_, _, rt) if sym.flags.is(ExtensionMethod) => rt
+        case MethodTpe(_, _, rt) => rt
         case info => info
-      case MethodTpe(_, _, rt: PolyType) => rt.instantiate(targs.map(_.tpe))
-      case MethodTpe(_, _, rt) if sym.flags.is(ExtensionMethod) => rt
-      case info => info
+
+    val unapplyInfo = sym.info match
+      case pt: PolyType =>
+        val info = pt.instantiate(targs1.map(_.tpe))
+        if sym.flags.is(ExtensionMethod) then extensionInfo(info, targs2) else info
+      case info =>
+        if sym.flags.is(ExtensionMethod) then extensionInfo(info, targs1) else info
 
     val unappplySym = newSymbol(cls, sym.name.toTermName, Synthetic | Method, unapplyInfo, coord = sym.coord).entered
     val unapply = DefDef(unappplySym, argss =>

tests/pos-macros/i8577a/Macro_1.scala

@@ -0,0 +1,11 @@
+package i8577
+
+import scala.quoted._
+
+object Macro:
+  opaque type StrCtx = StringContext
+  def apply(ctx: StringContext): StrCtx = ctx
+  def unapply(ctx: StrCtx): Option[StringContext] = Some(ctx)
+
+def implUnapply(sc: Expr[Macro.StrCtx], input: Expr[Int])(using Quotes): Expr[Option[Seq[Int]]] =
+  '{ Some(Seq(${input})) }

tests/pos-macros/i8577a/Main_2.scala

@@ -0,0 +1,9 @@
+package i8577
+
+def main: Unit =
+  extension (ctx: StringContext) def mac: Macro.StrCtx = Macro(ctx)
+  extension (inline ctx: Macro.StrCtx) inline def unapplySeq(inline input: Int): Option[Seq[Int]] =
+    ${ implUnapply('ctx, 'input) }
+
+  val mac"$x" = 1
+  assert(x == 1)

tests/pos-macros/i8577b/Macro_1.scala

@@ -0,0 +1,11 @@
+package i8577
+
+import scala.quoted._
+
+object Macro:
+  opaque type StrCtx = StringContext
+  def apply(ctx: StringContext): StrCtx = ctx
+  def unapply(ctx: StrCtx): Option[StringContext] = Some(ctx)
+
+def implUnapply[U](sc: Expr[Macro.StrCtx], input: Expr[U])(using Type[U])(using Quotes): Expr[Option[Seq[U]]] =
+  '{ Some(Seq(${input})) }

tests/pos-macros/i8577b/Main_2.scala

@@ -0,0 +1,9 @@
+package i8577
+
+def main: Unit =
+  extension (ctx: StringContext) def mac: Macro.StrCtx = Macro(ctx)
+  extension (inline ctx: Macro.StrCtx) inline def unapplySeq[U](inline input: U): Option[Seq[U]] =
+    ${ implUnapply('ctx, 'input) }
+
+  val mac"$x" = 1
+  assert(x == 1)

tests/pos-macros/i8577c/Macro_1.scala

@@ -0,0 +1,11 @@
+package i8577
+
+import scala.quoted._
+
+object Macro:
+  opaque type StrCtx = StringContext
+  def apply(ctx: StringContext): StrCtx = ctx
+  def unapply(ctx: StrCtx): Option[StringContext] = Some(ctx)
+
+def implUnapply[T](sc: Expr[Macro.StrCtx], input: Expr[T])(using Type[T])(using Quotes): Expr[Option[Seq[T]]] =
+  '{ Some(Seq(${input})) }

tests/pos-macros/i8577c/Main_2.scala

@@ -0,0 +1,9 @@
+package i8577
+
+def main: Unit =
+  extension (ctx: StringContext) def mac: Macro.StrCtx = Macro(ctx)
+  extension [T] (inline ctx: Macro.StrCtx) inline def unapplySeq(inline input: T): Option[Seq[T]] =
+    ${ implUnapply('ctx, 'input) }
+
+  val mac"$x" = 1
+  assert(x == 1)

tests/pos-macros/i8577d/Macro_1.scala

@@ -0,0 +1,11 @@
+package i8577
+
+import scala.quoted._
+
+object Macro:
+  opaque type StrCtx = StringContext
+  def apply(ctx: StringContext): StrCtx = ctx
+  def unapply(ctx: StrCtx): Option[StringContext] = Some(ctx)
+
+def implUnapply[T](sc: Expr[Macro.StrCtx], input: Expr[T])(using Type[T])(using Quotes): Expr[Option[Seq[T]]] =
+  '{ Some(Seq(${input})) }

tests/pos-macros/i8577d/Main_2.scala

@@ -0,0 +1,9 @@
+package i8577
+
+def main: Unit =
+  extension (ctx: StringContext) def mac: Macro.StrCtx = Macro(ctx)
+  extension [T] (inline ctx: Macro.StrCtx) inline def unapplySeq[U](inline input: T): Option[Seq[T]] =
+    ${ implUnapply('ctx, 'input) }
+
+  val mac"$x" = 1
+  assert(x == 1)

tests/pos-macros/i8577e/Macro_1.scala

@@ -0,0 +1,11 @@
+package i8577
+
+import scala.quoted._
+
+object Macro:
+  opaque type StrCtx = StringContext
+  def apply(ctx: StringContext): StrCtx = ctx
+  def unapply(ctx: StrCtx): Option[StringContext] = Some(ctx)
+
+def implUnapply[T, U](sc: Expr[Macro.StrCtx], input: Expr[U])(using Type[U])(using Quotes): Expr[Option[Seq[U]]] =
+  '{ Some(Seq(${input})) }

tests/pos-macros/i8577e/Main_2.scala

@@ -0,0 +1,9 @@
+package i8577
+
+def main: Unit =
+  extension (ctx: StringContext) def mac: Macro.StrCtx = Macro(ctx)
+  extension [T] (inline ctx: Macro.StrCtx) inline def unapplySeq[U](inline input: U): Option[Seq[U]] =
+    ${ implUnapply('ctx, 'input) }
+
+  val mac"$x" = 1
+  assert(x == 1)

tests/pos-macros/i8577f/Macro_1.scala

@@ -0,0 +1,11 @@
+package i8577
+
+import scala.quoted._
+
+object Macro:
+  opaque type StrCtx = StringContext
+  def apply(ctx: StringContext): StrCtx = ctx
+  def unapply(ctx: StrCtx): Option[StringContext] = Some(ctx)
+
+def implUnapply[T, U](sc: Expr[Macro.StrCtx], input: Expr[(T, U)])(using Type[T], Type[U])(using Quotes): Expr[Option[Seq[(T, U)]]] =
+  '{ Some(Seq(${input})) }

tests/pos-macros/i8577f/Main_2.scala

@@ -0,0 +1,12 @@
+package i8577
+
+def main: Unit =
+  extension (ctx: StringContext) def mac: Macro.StrCtx = Macro(ctx)
+  extension [T] (inline ctx: Macro.StrCtx) inline def unapplySeq[U](inline input: (T, U)): Option[Seq[(T, U)]] =
+    ${ implUnapply('ctx, 'input) }
+
+  val mac"$x" = (1, 2)
+  assert(x == (1, 2))
+
+  val mac"$y" = (1, "a")
+  assert(y == (1, "a"))

tests/pos-macros/i8577g/Macro_1.scala

@@ -0,0 +1,11 @@
+package i8577
+
+import scala.quoted._
+
+object Macro:
+  opaque type StrCtx = StringContext
+  def apply(ctx: StringContext): StrCtx = ctx
+  def unapply(ctx: StrCtx): Option[StringContext] = Some(ctx)
+
+def implUnapply[T, U](sc: Expr[Macro.StrCtx], input: Expr[T | U])(using Type[T], Type[U])(using Quotes): Expr[Option[Seq[T | U]]] =
+  '{ Some(Seq(${input})) }

tests/pos-macros/i8577g/Main_2.scala

@@ -0,0 +1,9 @@
+package i8577
+
+def main: Unit =
+  extension (ctx: StringContext) def mac: Macro.StrCtx = Macro(ctx)
+  extension [T] (inline ctx: Macro.StrCtx) inline def unapplySeq[U](inline input: T | U): Option[Seq[T | U]] =
+    ${ implUnapply('ctx, 'input) }
+
+  val mac"$x" = 1
+  assert(x == 1)

tests/pos-macros/i8577h/Macro_1.scala

@@ -0,0 +1,11 @@
+package i8577
+
+import scala.quoted._
+
+object Macro:
+  opaque type StrCtx = StringContext
+  def apply(ctx: StringContext): StrCtx = ctx
+  def unapply(ctx: StrCtx): Option[StringContext] = Some(ctx)
+
+def implUnapply[T, U](sc: Expr[Macro.StrCtx], input: Expr[T | U])(using Type[T], Type[U])(using Quotes): Expr[Option[Seq[T | U]]] =
+  '{ Some(Seq(${input})) }

tests/pos-macros/i8577h/Main_2.scala

@@ -0,0 +1,9 @@
+package i8577
+
+def main: Unit =
+  extension (ctx: StringContext) def mac: Macro.StrCtx = Macro(ctx)
+  extension [T] (inline ctx: Macro.StrCtx) inline def unapplySeq[U](inline input: U | T): Option[Seq[T | U]] =
+    ${ implUnapply('ctx, 'input) }
+
+  val mac"$x" = 1
+  assert(x == 1)