Replace scala.quoted.qctx with scala.quoted.reflect

Author: nicolasstucki

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

@@ -15,7 +15,7 @@ object Const {
    *  ```
    */
   def unapply[T](expr: Expr[T])(using qctx: QuoteContext): Option[T] = {
-    import qctx.reflect._
+    import reflect._
     def rec(tree: Term): Option[T] = tree match {
       case Literal(c) => Some(c.value.asInstanceOf[T])
       case Block(Nil, e) => rec(e)

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

@@ -14,7 +14,7 @@ object Expr {
    *   Some bindings may be elided as an early optimization.
    */
   def betaReduce[T](expr: Expr[T])(using qctx: QuoteContext): Expr[T] =
-    qctx.reflect.Term.betaReduce(expr.unseal) match
+    reflect.Term.betaReduce(expr.unseal) match
       case Some(expr1) => expr1.asExpr.asInstanceOf[Expr[T]]
       case _ => expr
 
@@ -23,7 +23,7 @@ object Expr {
    *  will be equivalent to `'{ $s1; $s2; ...; $e }`.
    */
   def block[T](statements: List[Expr[Any]], expr: Expr[T])(using qctx: QuoteContext): Expr[T] = {
-    import qctx.reflect._
+    import reflect._
     Block(statements.map(_.unseal), expr.unseal).asExpr.asInstanceOf[Expr[T]]
   }
 
@@ -209,7 +209,7 @@ object Expr {
    *  @param qctx current context
    */
   def summon[T](using tpe: Type[T])(using qctx: QuoteContext): Option[Expr[T]] = {
-    import qctx.reflect._
+    import reflect._
     Implicits.search(TypeRepr.of[T]) match {
       case iss: ImplicitSearchSuccess => Some(iss.tree.asExpr.asInstanceOf[Expr[T]])
       case isf: ImplicitSearchFailure => None

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

@@ -7,7 +7,7 @@ trait ExprMap:
 
   /** Map subexpressions an expression `e` with a type `tpe` */
   def transformChildren[T](e: Expr[T])(using qctx: QuoteContext, tpe: Type[T]): Expr[T] = {
-    import qctx.reflect._
+    import reflect._
     final class MapChildren() {
 
       def transformStatement(tree: Statement)(using ctx: Context): Statement = {

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

@@ -24,70 +24,70 @@ object Liftable {
   /** Default liftable for Boolean */
   given BooleanLiftable[T <: Boolean] as Liftable[T] {
     def toExpr(x: T) =
-      import qctx.reflect._
+      import reflect._
       Literal(Constant.Boolean(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default liftable for Byte */
   given ByteLiftable[T <: Byte] as Liftable[T] {
     def toExpr(x: T) =
-      import qctx.reflect._
+      import reflect._
       Literal(Constant.Byte(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default liftable for Short */
   given ShortLiftable[T <: Short] as Liftable[T] {
     def toExpr(x: T) =
-      import qctx.reflect._
+      import reflect._
       Literal(Constant.Short(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default liftable for Int */
   given IntLiftable[T <: Int] as Liftable[T] {
     def toExpr(x: T) =
-      import qctx.reflect._
+      import reflect._
       Literal(Constant.Int(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default liftable for Long */
   given LongLiftable[T <: Long] as Liftable[T] {
     def toExpr(x: T) =
-      import qctx.reflect._
+      import reflect._
       Literal(Constant.Long(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default liftable for Float */
   given FloatLiftable[T <: Float] as Liftable[T] {
     def toExpr(x: T) =
-      import qctx.reflect._
+      import reflect._
       Literal(Constant.Float(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default liftable for Double */
   given DoubleLiftable[T <: Double] as Liftable[T] {
     def toExpr(x: T) =
-      import qctx.reflect._
+      import reflect._
       Literal(Constant.Double(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default liftable for Char */
   given CharLiftable[T <: Char] as Liftable[T] {
     def toExpr(x: T) =
-      import qctx.reflect._
+      import reflect._
       Literal(Constant.Char(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default liftable for String */
   given StringLiftable[T <: String] as Liftable[T] {
     def toExpr(x: T) =
-      import qctx.reflect._
+      import reflect._
       Literal(Constant.String(x)).asExpr.asInstanceOf[Expr[T]]
   }
 
   /** Default liftable for Class[T] */
   given ClassLiftable[T] as Liftable[Class[T]] = new Liftable[Class[T]] {
     def toExpr(x: Class[T]) = {
-      import qctx.reflect._
+      import reflect._
       Ref(defn.Predef_classOf).appliedToType(TypeRepr.typeConstructorOf(x)).asExpr.asInstanceOf[Expr[Class[T]]]
     }
   }

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

@@ -13,11 +13,11 @@ object Type:
 
   /** Show a source code like representation of this type without syntax highlight */
   def show[T](using tp: Type[T])(using qctx: QuoteContext): String =
-    qctx.reflect.TypeTree.of[T].show
+    reflect.TypeTree.of[T].show
 
   /** Shows the tree as fully typed source code colored with ANSI */
   def showAnsiColored[T](using tp: Type[T])(using qctx: QuoteContext): String =
-    qctx.reflect.TypeTree.of[T].showAnsiColored
+    reflect.TypeTree.of[T].showAnsiColored
 
   /** Return a quoted.Type with the given type */
   @compileTimeOnly("Reference to `scala.quoted.Type.apply` was not handled by PickleQuotes")

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

@@ -16,7 +16,7 @@ object Varargs {
    *  ```
    */
   def apply[T](xs: Seq[Expr[T]])(using tp: Type[T], qctx: QuoteContext): Expr[Seq[T]] = {
-    import qctx.reflect._
+    import reflect._
     Repeated(xs.map[Term](_.unseal).toList, TypeTree.of[T]).asExpr.asInstanceOf[Expr[Seq[T]]]
   }
 
@@ -33,7 +33,7 @@ object Varargs {
    *  ```
    */
   def unapply[T](expr: Expr[Seq[T]])(using qctx: QuoteContext): Option[Seq[Expr[T]]] = {
-    import qctx.reflect._
+    import reflect._
     def rec(tree: Term): Option[Seq[Expr[T]]] = tree match {
       case Typed(Repeated(elems, _), _) => Some(elems.map(x => x.asExpr.asInstanceOf[Expr[T]]))
       case Block(Nil, e) => rec(e)

library/src/scala/quoted/QuoteContext.scala

@@ -6,7 +6,7 @@ package scala.quoted
  *  It contains the low-level Typed AST API metaprogramming API.
  *  This API does not have the static type guarantiees that `Expr` and `Type` provide.
  *
- *  @param tasty Typed AST API. Usage: `def f(qctx: QuoteContext) = { import qctx.reflect._; ... }`.
+ *  @param tasty Typed AST API. Usage: `def f(qctx: QuoteContext) = { import reflect._; ... }`.
  */
 trait QuoteContext { self: internal.QuoteUnpickler & internal.QuoteMatching =>
 
@@ -75,10 +75,10 @@ trait QuoteContext { self: internal.QuoteUnpickler & internal.QuoteMatching =>
    *  to explicitly state that a context is nested as in the following example:
    *
    *  ```scala
-   *  def run(using qctx: QuoteContext)(tree: qctx.reflect.Tree): Unit =
+   *  def run(using qctx: QuoteContext)(tree: reflect.Tree): Unit =
    *    def nested()(using qctx.Nested): Expr[Int] = '{  ${ makeExpr(tree) } + 1  }
    *    '{  ${ nested() } + 2 }
-   *  def makeExpr(using qctx: QuoteContext)(tree: qctx.reflect.Tree): Expr[Int] = ???
+   *  def makeExpr(using qctx: QuoteContext)(tree: reflect.Tree): Expr[Int] = ???
    *  ```
    */
   type Nested = QuoteContext {

library/src/scala/quoted/qctx.scala

@@ -0,0 +1,18 @@
+package scala.quoted
+
+/** Current QuoteContext.reflect in scope
+ *
+ *  Usage:
+ *  To use reflection inside a method
+ *  ```
+ *  def f(using QuoteContext) = { // or (using qctx: QuoteContext)
+ *    import reflect._ // equivalent to import qctx.reflect._
+ *    ...
+ *  }
+ *  ```
+ *  or to use reflection in the signature of a method
+ *  ```
+ *  def f(using QuoteContext)(tree: reflect.Tree): reflect.Position = ...
+ *  ```
+ */
+def reflect(using qctx: QuoteContext): qctx.reflect.type = qctx.reflect

library/src/scala/quoted/reflect.scala

@@ -4,11 +4,11 @@ object report:
 
   /** Report an error at the position of the macro expansion */
   def error(msg: => String)(using qctx: QuoteContext): Unit =
-    qctx.reflect.Reporting.error(msg, qctx.reflect.Position.ofMacroExpansion)
+    reflect.Reporting.error(msg, reflect.Position.ofMacroExpansion)
 
   /** Report an error at the on the position of `expr` */
   def error(msg: => String, expr: Expr[Any])(using qctx: QuoteContext): Unit =
-    qctx.reflect.Reporting.error(msg, expr.unseal.pos)
+    reflect.Reporting.error(msg, expr.unseal.pos)
 
   /** Report an error at the position of the macro expansion and throws a StopQuotedContext */
   def throwError(msg: => String)(using qctx: QuoteContext): Nothing = {
@@ -23,11 +23,11 @@ object report:
 
   /** Report a warning */
   def warning(msg: => String)(using qctx: QuoteContext): Unit =
-    qctx.reflect.Reporting.warning(msg, qctx.reflect.Position.ofMacroExpansion)
+    reflect.Reporting.warning(msg, reflect.Position.ofMacroExpansion)
 
   /** Report a warning at the on the position of `expr` */
   def warning(msg: => String, expr: Expr[_])(using qctx: QuoteContext): Unit =
-    qctx.reflect.Reporting.warning(msg, expr.unseal.pos)
+    reflect.Reporting.warning(msg, expr.unseal.pos)
 
   /** Throwable used to stop the expansion of a macro after an error was reported */
   class StopQuotedContext extends Throwable

library/src/scala/quoted/report.scala

@@ -3447,7 +3447,7 @@ trait Reflection { reflection =>
    *
    *  Usage:
    *  ```
-   *  import qctx.reflect._
+   *  import reflect._
    *  class MyTreeMap extends TreeMap {
    *    override def transformTree(tree: Tree)(using ctx: Context): Tree = ...
    *  }

library/src/scala/tasty/Reflection.scala

@@ -7,7 +7,7 @@ object SummonJsonEncoderTest {
   inline def encodeAndMessAroundType[T](value: =>T): String = ${ encodeAndMessAroundTypeImpl('value) }
 
   def encodeAndMessAroundTypeImpl[T: Type](value: Expr[T])(using qctx: QuoteContext): Expr[String] = {
-    import qctx.reflect._
+    import reflect._
 
     val mirrorExpr = Expr.summon[Mirror.Of[T]] match {
       case Some(mirror) => mirror

tests/disabled/pos-macros/i7853/SummonJsonEncoderTest_2.scala

@@ -4,7 +4,7 @@ import scala.quoted._
 inline def f: Any = ${ fImpl }
 
 private def fImpl(using qctx: QuoteContext): Expr[Unit] = {
-  import qctx.reflect._
+  import reflect._
   Implicits.search(TypeRepr.of[A]) match {
     case x: ImplicitSearchSuccess =>
       '{}

tests/neg-macros/delegate-match-1/Macro_1.scala

@@ -4,7 +4,7 @@ import scala.quoted._
 inline def f: Any = ${ fImpl }
 
 private def fImpl (using qctx: QuoteContext) : Expr[Unit] = {
-  import qctx.reflect._
+  import reflect._
   Implicits.search(TypeRepr.of[A]) match {
     case x: ImplicitSearchSuccess =>
       '{}

tests/neg-macros/delegate-match-2/Macro_1.scala

@@ -4,7 +4,7 @@ import scala.quoted._
 inline def f: Any = ${ fImpl }
 
 private def fImpl(using qctx: QuoteContext) : Expr[Unit] = {
-  import qctx.reflect._
+  import reflect._
   Implicits.search(TypeRepr.of[A]) match {
     case x: ImplicitSearchSuccess =>
       '{}

tests/neg-macros/delegate-match-3/Macro_1.scala

@@ -6,7 +6,7 @@ object Macro {
   extension (inline sc: StringContext) inline def foo(args: String*): Unit = ${ impl('sc) }
 
   def impl(sc: Expr[StringContext])(using qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.reflect._
+    import reflect._
     sc match {
       case '{ StringContext(${Varargs(parts)}: _*) } =>
         for (part @ Const(s) <- parts)

tests/neg-macros/i6432/Macro_1.scala

@@ -6,7 +6,7 @@ object Macro {
   extension (inline sc: StringContext) inline def foo(args: String*): Unit = ${ impl('sc) }
 
   def impl(sc: Expr[StringContext])(using qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.reflect._
+    import reflect._
     sc match {
       case '{ StringContext(${Varargs(parts)}: _*) } =>
         for (part @ Const(s) <- parts)

tests/neg-macros/i6432b/Macro_1.scala

@@ -2,7 +2,7 @@ import scala.quoted._
 
 object Test {
   def staged[T](using qctx: QuoteContext) = {
-    import qctx.reflect._
+    import reflect._
     given typeT as Type[T] // error
     val tt = TypeRepr.of[T]
     '{ "in staged" }

tests/neg-macros/i7919.scala

@@ -1,7 +1,7 @@
 import scala.quoted._
 object Macro {
   def impl[A : Type](using qctx: QuoteContext): Unit = {
-    import qctx.reflect._
+    import reflect._
     val tpe = TypeRepr.of[A].asType.asInstanceOf[Type[_ <: AnyRef]]
     '{ (a: ${tpe}) => ???} // error
   }

tests/neg-macros/i8871.scala

@@ -1,7 +1,7 @@
 import scala.quoted._
 object Macro {
   def impl[A : Type](using qctx: QuoteContext): Unit = {
-    import qctx.reflect._
+    import reflect._
     val tpe/*: Type[? <: AnyKind]*/ = TypeRepr.of[A].asType
     '{ f[$tpe] } // error
   }

tests/neg-macros/i8871b.scala

@@ -15,6 +15,6 @@ def impl(prog: Expr[Double])(using QuoteContext) : Expr[Double] =
     triggerStackOverflow(0)
   } catch {
     case e =>
-      qctx.reflect.Reporting.error(e.getMessage, prog.unseal.pos)
+      reflect.Reporting.error(e.getMessage, prog.unseal.pos)
       '{ 42.0 }
   }

tests/neg-macros/i9801/Macro_1.scala

@@ -5,7 +5,7 @@ object Foo {
   inline def myMacro(): Unit = ${ aMacroImplementation }
 
   def aMacroImplementation(using qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.reflect._
+    import reflect._
     Reporting.error("some error", Position.ofMacroExpansion)
     throw new NoClassDefFoundError("Bar$")
   }

tests/neg-macros/macros-in-same-project-6/Foo.scala

@@ -13,7 +13,7 @@ object Asserts {
     ${impl('cond)}
 
   def impl(cond: Expr[Boolean])(using qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.reflect._
+    import reflect._
 
     val tree = cond.unseal
 

tests/neg-macros/tasty-macro-assert-1/quoted_1.scala

@@ -13,7 +13,7 @@ object Asserts {
     ${ impl('cond) }
 
   def impl(cond: Expr[Boolean])(using qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.reflect._
+    import reflect._
 
     val tree = cond.unseal
 

tests/neg-macros/tasty-macro-assert-2/quoted_1.scala

@@ -5,7 +5,7 @@ object Macros {
   inline def fun(x: Any): Unit = ${ impl('x) }
 
   def impl(x: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.reflect._
+    import reflect._
     Reporting.error("here is the the argument is " + x.unseal.underlyingArgument.show, x.unseal.underlyingArgument.pos)
     '{}
   }

tests/neg-macros/tasty-macro-error/quoted_1.scala

@@ -5,7 +5,7 @@ object Macros {
   inline def fun(x: Any): Unit = ${ impl('x) }
 
   def impl(x: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.reflect._
+    import reflect._
     val pos = x.unseal.underlyingArgument.pos
     Reporting.error("here is the the argument is " + x.unseal.underlyingArgument.show, pos)
     Reporting.error("here (+5) is the the argument is " + x.unseal.underlyingArgument.show, pos.sourceFile, pos.start + 5, pos.end + 5)

tests/neg-macros/tasty-macro-positions/quoted_1.scala

@@ -10,7 +10,7 @@ object Macro {
 object FIntepolator {
 
   def apply(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[Any]])(using qctx: QuoteContext) : Expr[String] = {
-    import qctx.reflect._
+    import reflect._
     Reporting.error("there are no parts", strCtxExpr.unseal.underlyingArgument.pos)
     '{ ($strCtxExpr).s($argsExpr: _*) }
   }

tests/neg-macros/tasty-string-interpolator-position-a/Macro_1.scala

@@ -9,7 +9,7 @@ object Macro {
 
 object FIntepolator {
   def apply(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[Any]])(using qctx: QuoteContext) : Expr[String] = {
-    import qctx.reflect._
+    import reflect._
     Reporting.error("there are no args", argsExpr.unseal.underlyingArgument.pos)
     '{ ($strCtxExpr).s($argsExpr: _*) }
   }