Fix: SplitByType macros

src/main/scala-3/com/raquo/airstream/split/MacrosUtilities.scala

@@ -1,73 +1,70 @@
 package com.raquo.airstream.split
 
 import scala.quoted.{Expr, Quotes, Type}
+import scala.annotation.tailrec
+import scala.annotation.compileTimeOnly
 
 private[split] object MacrosUtilities {
 
-  def exprOfListToListOfExpr[T: Type](
-    pfListExpr: Expr[List[T]]
-  )(
-    using quotes: Quotes
-  ): List[Expr[T]] = {
-    import quotes.reflect.*
+  type CaseAny = Any
+  type HandlerAny[+O] = Any
 
-    pfListExpr match {
-      case '{ $headExpr :: (${ tailExpr }: List[T]) } =>
-        headExpr :: exprOfListToListOfExpr(tailExpr)
-      case '{ Nil } => Nil
-      case _ =>
-        report.errorAndAbort(
-          "Macro expansion failed, please use `handleCase` instead"
-        )
-    }
+  final case class MatchTypeHandler[T] private (private val underlying: Unit) extends AnyVal
 
+  object MatchTypeHandler {
+    @compileTimeOnly("MatchTypeHandler[T] cannot be used at runtime")
+    def instance[T]: MatchTypeHandler[T] = throw new UnsupportedOperationException("MatchTypeHandler[T] cannot be used at runtime")
   }
 
-  def listOfExprToExprOfList[T: Type](
-    pfExprList: List[Expr[T]]
-  )(
-    using quotes: Quotes
-  ): Expr[List[T]] = {
-    import quotes.reflect.*
+  final case class MatchValueHandler[V] private (private val underlying: Unit) extends AnyVal
 
-    pfExprList match
-      case head :: tail => '{ $head :: ${ listOfExprToExprOfList(tail) } }
-      case Nil          => '{ Nil }
+  object MatchValueHandler {
+    @compileTimeOnly("MatchValueHandler[V] cannot be used at runtime")
+    def instance[V](v: V): MatchValueHandler[V] = throw new UnsupportedOperationException("MatchValueHandler[V] cannot be used at runtime")
   }
 
   def innerObservableImpl[I: Type](
     iExpr: Expr[I],
-    caseListExpr: Expr[List[PartialFunction[Any, Any]]]
+    caseExprSeq: Seq[Expr[CaseAny]]
   )(
     using quotes: Quotes
-  ): Expr[(Int, Any)] = {
+  ) = {
     import quotes.reflect.*
 
-    val caseExprList = exprOfListToListOfExpr(caseListExpr)
-
-    val allCaseDefLists = caseExprList.reverse.zipWithIndex
-      .flatMap { case (caseExpr, idx) =>
-        caseExpr.asTerm match {
-          case Lambda(_, Match(_, caseDefList)) => {
-            caseDefList.map { caseDef =>
-              val idxExpr = Expr.apply(idx)
-              val newRhsExpr = '{
-                val res = ${ caseDef.rhs.asExprOf[Any] }; ($idxExpr, res)
-              }
-              CaseDef.copy(caseDef)(
-                caseDef.pattern,
-                caseDef.guard,
-                newRhsExpr.asTerm
-              )
+    @tailrec
+    def getCaseDef(
+      idx: Int,
+      term: Term
+    ): List[CaseDef] = {
+      term match {
+        case Inlined(_, _, inlinedTerm) => getCaseDef(idx, inlinedTerm)
+        case Lambda(_, Match(_, caseDefList)) => {
+          caseDefList.map { caseDef =>
+            val idxExpr = Expr.apply(idx)
+            val newRhsExpr = '{
+              val res = ${ caseDef.rhs.asExprOf[Any] }; ($idxExpr, res)
             }
-          }
-          case _ =>
-            report.errorAndAbort(
-              "Macro expansion failed, please use `handleCase` with annonymous partial function"
+            CaseDef.copy(caseDef)(
+              caseDef.pattern,
+              caseDef.guard,
+              newRhsExpr.asTerm
             )
+          }
         }
+        case _ =>
+          report.errorAndAbort(
+            "Macro expansion failed, please use `handleCase` with annonymous partial function"
+          )
+      }
+    }
+
+    val allCaseDefLists = caseExprSeq.view
+      .zipWithIndex
+      .flatMap { case (caseExpr, idx) =>
+        getCaseDef(idx, caseExpr.asTerm)
       }
       .map(_.changeOwner(Symbol.spliceOwner))
+      .toList
 
     Match(iExpr.asTerm, allCaseDefLists).asExprOf[(Int, Any)]
   }