Port to QuoteScope

Author: nicolasstucki

library/src-bootstrapped/scala/quoted/Expr.scala

@@ -198,10 +198,10 @@ object Expr {
    *  @param tpe quoted type of the implicit parameter
    *  @param qctx current context
    */
-  def summon[T](using tpe: Type[T])(using qctx: QuoteContext): Option[Expr[T]] = {
-    import qctx.tasty._
+  def summon[T](using s: QuoteScope)(using tpe: s.Type[T]): Option[s.Expr[T]] = {
+    import s.tasty._
     searchImplicit(tpe.unseal.tpe) match {
-      case iss: ImplicitSearchSuccess => Some(iss.tree.seal.asInstanceOf[Expr[T]])
+      case iss: ImplicitSearchSuccess => Some(iss.tree.seal.asInstanceOf[s.Expr[T]])
       case isf: ImplicitSearchFailure => None
     }
   }

library/src-bootstrapped/scala/quoted/QuoteScope.scala

@@ -64,6 +64,20 @@ trait QuoteScope { self =>
   /** Quoted type (or kind) `T` */
   type Type[T <: AnyKind] <: scala.quoted.Type[T] // TODO replace `<: scala.quoted.Type[T]` with `<: tasty.Type`
 
+  object Type {
+    // /** Show a source code like representation of this type without syntax highlight */
+    // def show(using qctx: QuoteContext): String =
+    //   this.unseal.showWith(SyntaxHighlight.plain)
+
+    // /** Show a source code like representation of this type */
+    // def show(syntaxHighlight: SyntaxHighlight)(using qctx: QuoteContext): String =
+    //   this.unseal.showWith(syntaxHighlight)
+
+    /** View this expression `Type[T]` as a `tasty.TypeTree` */
+    def [T <: AnyKind](tpe: Type[T]).unseal: self.tasty.TypeTree =
+      self.tasty.internal.QuotedType_unseal(tpe.asInstanceOf[scala.quoted.Type[T]])(using self.tasty.rootContext)
+  }
+
   /** Low-level Typed AST API `tasty` meta-programming API.
    *  This API does not have the static type guarantiees that `Expr` and `Type` provide.
    */

library/src-bootstrapped/scala/quoted/Type.scala

@@ -7,16 +7,16 @@ class Type[T <: AnyKind] private[scala] {
   type `$splice` = T
 
   /** Show a source code like representation of this type without syntax highlight */
-  def show(using qctx: QuoteContext): String =
+  def show(using s: QuoteScope): String =
     this.unseal.showWith(SyntaxHighlight.plain)
 
   /** Show a source code like representation of this type */
-  def show(syntaxHighlight: SyntaxHighlight)(using qctx: QuoteContext): String =
+  def show(syntaxHighlight: SyntaxHighlight)(using s: QuoteScope): String =
     this.unseal.showWith(syntaxHighlight)
 
   /** View this expression `quoted.Type[T]` as a `TypeTree` */
-  def unseal(using qctx: QuoteContext): qctx.tasty.TypeTree =
-    qctx.tasty.internal.QuotedType_unseal(this)(using qctx.tasty.rootContext)
+  def unseal(using s: QuoteScope): s.tasty.TypeTree =
+    s.tasty.internal.QuotedType_unseal(this)(using s.tasty.rootContext)
 
 }
 

library/src-bootstrapped/scala/quoted/Varargs.scala

@@ -15,9 +15,9 @@ object Varargs {
    *  '{ List(${Varargs(List(1, 2, 3))}: _*) } // equvalent to '{ List(1, 2, 3) }
    *  ```
    */
-  def apply[T](xs: Seq[Expr[T]])(using tp: Type[T], qctx: QuoteContext): Expr[Seq[T]] = {
-    import qctx.tasty._
-    Repeated(xs.map[Term](_.unseal).toList, tp.unseal).seal.asInstanceOf[Expr[Seq[T]]]
+  def apply[T](using s: QuoteScope)(xs: Seq[s.Expr[T]])(using tp: s.Type[T]): s.Expr[Seq[T]] = {
+    import s.tasty._
+    Repeated(xs.map[Term](_.unseal).toList, tp.unseal).seal.asInstanceOf[s.Expr[Seq[T]]]
   }
 
   /** Matches a literal sequence of expressions and return a sequence of expressions.
@@ -32,10 +32,10 @@ object Varargs {
    *  }
    *  ```
    */
-  def unapply[T](expr: Expr[Seq[T]])(using qctx: QuoteContext): Option[Seq[Expr[T]]] = {
-    import qctx.tasty._
-    def rec(tree: Term): Option[Seq[Expr[T]]] = tree match {
-      case Typed(Repeated(elems, _), _) => Some(elems.map(x => x.seal.asInstanceOf[Expr[T]]))
+  def unapply[T](using s: QuoteScope)(expr: s.Expr[Seq[T]]): Option[Seq[s.Expr[T]]] = {
+    import s.tasty._
+    def rec(tree: Term): Option[Seq[s.Expr[T]]] = tree match {
+      case Typed(Repeated(elems, _), _) => Some(elems.map(x => x.seal.asInstanceOf[s.Expr[T]]))
       case Block(Nil, e) => rec(e)
       case Inlined(_, Nil, e) => rec(e)
       case _  => None

tests/run-macros/i8007/Macro_1.scala

@@ -19,9 +19,7 @@ object Macro1 {
   def test1Impl[T: Type](value: Expr[T])(using qctx: QuoteContext): Expr[List[String]] = {
     import qctx.tasty._
 
-    val mirrorTpe = '[Mirror.Of[T]]
-
-    Expr.summon(using mirrorTpe).get match {
+    Expr.summon[Mirror.Of[T]].get match {
       case '{ $m: Mirror.ProductOf[T]{ type MirroredElemLabels = $t } } => {
         Expr(mirrorFields(t))
       }

tests/run-macros/i8007/Macro_2.scala

@@ -45,8 +45,7 @@ object Macro2 {
   def test2Impl[T: Type](value: Expr[T])(using qctx: QuoteContext): Expr[Unit] = {
     import qctx.tasty._
 
-    val mirrorTpe = '[Mirror.Of[T]]
-    val mirrorExpr = Expr.summon(using mirrorTpe).get
+    val mirrorExpr = Expr.summon[Mirror.Of[T]].get
     val derivedInstance = JsonEncoder.derived(mirrorExpr)
 
     '{

tests/run-macros/i8007/Macro_3.scala

@@ -35,7 +35,7 @@ object Eq {
   given derived[T: Type](using qctx: QuoteContext) as Expr[Eq[T]] = {
     import qctx.tasty._
 
-    val ev: Expr[Mirror.Of[T]] = Expr.summon(using '[Mirror.Of[T]]).get
+    val ev: Expr[Mirror.Of[T]] = Expr.summon[Mirror.Of[T]].get
 
     ev match {
       case '{ $m: Mirror.ProductOf[T] { type MirroredElemTypes = $elementTypes }} =>

tests/run-macros/string-context-implicits/Macro_1.scala

@@ -9,7 +9,7 @@ private def showMeExpr(sc: Expr[StringContext], argsExpr: Expr[Seq[Any]])(using
       val argShowedExprs = argExprs.map {
         case '{ $arg: $tp } =>
           val showTp = '[Show[$tp]]
-          Expr.summon(using showTp) match {
+          Expr.summon[Show[$tp]] match {
             case Some(showExpr) => '{ $showExpr.show($arg) }
             case None => Reporting.error(s"could not find implicit for ${showTp.show}", arg); '{???}
           }