diff --git a/compiler/src/scala/quoted/internal/impl/printers/Extractors.scala b/compiler/src/scala/quoted/internal/impl/printers/Extractors.scala index d0209ff724c1..e9595e1a5a4d 100644 --- a/compiler/src/scala/quoted/internal/impl/printers/Extractors.scala +++ b/compiler/src/scala/quoted/internal/impl/printers/Extractors.scala @@ -5,20 +5,20 @@ import scala.quoted._ object Extractors { - def showTree(using QuoteContext)(tree: qctx.reflect.Tree): String = + def showTree(using qctx: QuoteContext)(tree: reflect.Tree): String = new ExtractorsPrinter[qctx.type]().visitTree(tree).result() - def showType(using QuoteContext)(tpe: qctx.reflect.TypeRepr): String = + def showType(using qctx: QuoteContext)(tpe: reflect.TypeRepr): String = new ExtractorsPrinter[qctx.type]().visitType(tpe).result() - def showConstant(using QuoteContext)(const: qctx.reflect.Constant): String = + def showConstant(using qctx: QuoteContext)(const: reflect.Constant): String = new ExtractorsPrinter[qctx.type]().visitConstant(const).result() - def showSymbol(using QuoteContext)(symbol: qctx.reflect.Symbol): String = + def showSymbol(using qctx: QuoteContext)(symbol: reflect.Symbol): String = new ExtractorsPrinter[qctx.type]().visitSymbol(symbol).result() - def showFlags(using QuoteContext)(flags: qctx.reflect.Flags): String = { - import qctx.reflect._ + def showFlags(using qctx: QuoteContext)(flags: reflect.Flags): String = { + import reflect._ val flagList = List.newBuilder[String] if (flags.is(Flags.Abstract)) flagList += "Flags.Abstract" if (flags.is(Flags.Artifact)) flagList += "Flags.Artifact" @@ -58,7 +58,7 @@ object Extractors { } private class ExtractorsPrinter[QCtx <: QuoteContext & Singleton](using val qctx: QCtx) { self => - import qctx.reflect._ + import reflect._ private val sb: StringBuilder = new StringBuilder diff --git a/compiler/src/scala/quoted/internal/impl/printers/SourceCode.scala b/compiler/src/scala/quoted/internal/impl/printers/SourceCode.scala index 8c903b69312f..3db52a0fd910 100644 --- a/compiler/src/scala/quoted/internal/impl/printers/SourceCode.scala +++ b/compiler/src/scala/quoted/internal/impl/printers/SourceCode.scala @@ -6,20 +6,20 @@ import scala.annotation.switch /** Printer for fully elaborated representation of the source code */ object SourceCode { - def showTree(using QuoteContext)(tree: qctx.reflect.Tree)(syntaxHighlight: SyntaxHighlight): String = + def showTree(using qctx: QuoteContext)(tree: reflect.Tree)(syntaxHighlight: SyntaxHighlight): String = new SourceCodePrinter[qctx.type](syntaxHighlight).printTree(tree).result() - def showType(using QuoteContext)(tpe: qctx.reflect.TypeRepr)(syntaxHighlight: SyntaxHighlight): String = + def showType(using qctx: QuoteContext)(tpe: reflect.TypeRepr)(syntaxHighlight: SyntaxHighlight): String = new SourceCodePrinter[qctx.type](syntaxHighlight).printType(tpe)(using None).result() - def showConstant(using QuoteContext)(const: qctx.reflect.Constant)(syntaxHighlight: SyntaxHighlight): String = + def showConstant(using qctx: QuoteContext)(const: reflect.Constant)(syntaxHighlight: SyntaxHighlight): String = new SourceCodePrinter[qctx.type](syntaxHighlight).printConstant(const).result() - def showSymbol(using QuoteContext)(symbol: qctx.reflect.Symbol)(syntaxHighlight: SyntaxHighlight): String = + def showSymbol(using qctx: QuoteContext)(symbol: reflect.Symbol)(syntaxHighlight: SyntaxHighlight): String = symbol.fullName - def showFlags(using QuoteContext)(flags: qctx.reflect.Flags)(syntaxHighlight: SyntaxHighlight): String = { - import qctx.reflect._ + def showFlags(using qctx: QuoteContext)(flags: reflect.Flags)(syntaxHighlight: SyntaxHighlight): String = { + import reflect._ val flagList = List.newBuilder[String] if (flags.is(Flags.Abstract)) flagList += "abstract" if (flags.is(Flags.Artifact)) flagList += "artifact" @@ -60,7 +60,7 @@ object SourceCode { private class SourceCodePrinter[QCtx <: QuoteContext & Singleton](syntaxHighlight: SyntaxHighlight)(using val qctx: QCtx) { import syntaxHighlight._ - import qctx.reflect._ + import reflect._ private[this] val sb: StringBuilder = new StringBuilder diff --git a/library/src-bootstrapped/scala/quoted/Expr.scala b/library/src-bootstrapped/scala/quoted/Expr.scala index 3d13259d4505..03d9989a8398 100644 --- a/library/src-bootstrapped/scala/quoted/Expr.scala +++ b/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] = - import qctx.reflect._ + import reflect._ Term.betaReduce(Term.of(expr)) match case Some(expr1) => expr1.asExpr.asInstanceOf[Expr[T]] case _ => expr @@ -24,7 +24,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(Term.of), Term.of(expr)).asExpr.asInstanceOf[Expr[T]] } @@ -210,7 +210,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 diff --git a/library/src-bootstrapped/scala/quoted/ExprMap.scala b/library/src-bootstrapped/scala/quoted/ExprMap.scala index fef1ec689375..65354cab18df 100644 --- a/library/src-bootstrapped/scala/quoted/ExprMap.scala +++ b/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 = { diff --git a/library/src-bootstrapped/scala/quoted/Liftable.scala b/library/src-bootstrapped/scala/quoted/Liftable.scala index 2247356471f7..bb39b24e046f 100644 --- a/library/src-bootstrapped/scala/quoted/Liftable.scala +++ b/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]]] } } diff --git a/library/src-bootstrapped/scala/quoted/Type.scala b/library/src-bootstrapped/scala/quoted/Type.scala index e751e34e1e47..2cd5f2715de4 100644 --- a/library/src-bootstrapped/scala/quoted/Type.scala +++ b/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.of` was not handled by PickleQuotes") diff --git a/library/src/scala/quoted/Const.scala b/library/src/scala/quoted/Const.scala index cdbb4e33a731..3a76b43c5c5f 100644 --- a/library/src/scala/quoted/Const.scala +++ b/library/src/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) diff --git a/library/src/scala/quoted/QuoteContext.scala b/library/src/scala/quoted/QuoteContext.scala index 277b5a8d7132..a4729d8828be 100644 --- a/library/src/scala/quoted/QuoteContext.scala +++ b/library/src/scala/quoted/QuoteContext.scala @@ -8,7 +8,7 @@ import scala.reflect.TypeTest * 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 => @@ -3552,7 +3552,7 @@ trait QuoteContext { self: internal.QuoteUnpickler & internal.QuoteMatching => * * Usage: * ``` - * import qctx.reflect._ + * import reflect._ * class MyTreeMap extends TreeMap { * override def transformTree(tree: Tree)(using ctx: Context): Tree = ... * } @@ -3722,10 +3722,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 { diff --git a/library/src/scala/quoted/Varargs.scala b/library/src/scala/quoted/Varargs.scala index 5638783a8505..2a8cdc89be68 100644 --- a/library/src/scala/quoted/Varargs.scala +++ b/library/src/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.of).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) diff --git a/library/src/scala/quoted/reflect.scala b/library/src/scala/quoted/reflect.scala new file mode 100644 index 000000000000..530412a67cf1 --- /dev/null +++ b/library/src/scala/quoted/reflect.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 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 diff --git a/library/src/scala/quoted/report.scala b/library/src/scala/quoted/report.scala index 1fcb45fa8992..a0c66d354d5e 100644 --- a/library/src/scala/quoted/report.scala +++ b/library/src/scala/quoted/report.scala @@ -4,12 +4,12 @@ object report: /** Report an error at the position of the macro expansion */ def error(msg: => String)(using qctx: QuoteContext): Unit = - import qctx.reflect._ + import reflect._ Reporting.error(msg, Position.ofMacroExpansion) /** Report an error at the on the position of `expr` */ def error(msg: => String, expr: Expr[Any])(using qctx: QuoteContext): Unit = - import qctx.reflect._ + import reflect._ Reporting.error(msg, Term.of(expr).pos) /** Report an error at the position of the macro expansion and throws a StopMacroExpansion */ @@ -25,12 +25,12 @@ object report: /** Report a warning */ def warning(msg: => String)(using qctx: QuoteContext): Unit = - import qctx.reflect._ + import reflect._ Reporting.warning(msg, Position.ofMacroExpansion) /** Report a warning at the on the position of `expr` */ def warning(msg: => String, expr: Expr[Any])(using qctx: QuoteContext): Unit = - import qctx.reflect._ + import reflect._ Reporting.warning(msg, Term.of(expr).pos) end report diff --git a/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala b/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala index b7aa7726b89f..47056be04a16 100644 --- a/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala +++ b/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala @@ -20,7 +20,7 @@ trait TastyInspector: self => /** Process a TASTy file using TASTy reflect */ - protected def processCompilationUnit(using QuoteContext)(root: qctx.reflect.Tree): Unit + protected def processCompilationUnit(using QuoteContext)(root: reflect.Tree): Unit /** Called after all compilation units are processed */ protected def postProcess(using QuoteContext): Unit = () diff --git a/tests/disabled/pos-macros/i7853/SummonJsonEncoderTest_2.scala b/tests/disabled/pos-macros/i7853/SummonJsonEncoderTest_2.scala index 674500966c90..78722747f11f 100644 --- a/tests/disabled/pos-macros/i7853/SummonJsonEncoderTest_2.scala +++ b/tests/disabled/pos-macros/i7853/SummonJsonEncoderTest_2.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 diff --git a/tests/neg-macros/delegate-match-1/Macro_1.scala b/tests/neg-macros/delegate-match-1/Macro_1.scala index 782fe8b2f4e3..5e4b8e01f4c3 100644 --- a/tests/neg-macros/delegate-match-1/Macro_1.scala +++ b/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 => '{} diff --git a/tests/neg-macros/delegate-match-2/Macro_1.scala b/tests/neg-macros/delegate-match-2/Macro_1.scala index e40f2f608e1d..d59763d81383 100644 --- a/tests/neg-macros/delegate-match-2/Macro_1.scala +++ b/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 => '{} diff --git a/tests/neg-macros/delegate-match-3/Macro_1.scala b/tests/neg-macros/delegate-match-3/Macro_1.scala index 3167e3152d4f..fa3702ec65d8 100644 --- a/tests/neg-macros/delegate-match-3/Macro_1.scala +++ b/tests/neg-macros/delegate-match-3/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 => '{} diff --git a/tests/neg-macros/i6432/Macro_1.scala b/tests/neg-macros/i6432/Macro_1.scala index 27cebe1290a2..38a7a70cab87 100644 --- a/tests/neg-macros/i6432/Macro_1.scala +++ b/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) diff --git a/tests/neg-macros/i6432b/Macro_1.scala b/tests/neg-macros/i6432b/Macro_1.scala index 27cebe1290a2..38a7a70cab87 100644 --- a/tests/neg-macros/i6432b/Macro_1.scala +++ b/tests/neg-macros/i6432b/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) diff --git a/tests/neg-macros/i7698.scala b/tests/neg-macros/i7698.scala index 64c07cf31e25..0d0a7e573c3c 100644 --- a/tests/neg-macros/i7698.scala +++ b/tests/neg-macros/i7698.scala @@ -5,7 +5,7 @@ trait Show[T] { } def showInterpolatorImpl(sc: Expr[StringContext], argsExpr: Expr[Seq[Any]])(using qctx: QuoteContext): Expr[String] = - import qctx.reflect._ + import reflect._ Term.of(argsExpr) match case '{ $arg: $t } => // error case '[ Int ] => // error diff --git a/tests/neg-macros/i7919.scala b/tests/neg-macros/i7919.scala index 49588f9c1f3e..8f728777b541 100644 --- a/tests/neg-macros/i7919.scala +++ b/tests/neg-macros/i7919.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" } diff --git a/tests/neg-macros/i8871.scala b/tests/neg-macros/i8871.scala index 676010941faa..cac20a853a43 100644 --- a/tests/neg-macros/i8871.scala +++ b/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 = TypeRepr.of[A].asType.asInstanceOf[Type[_ <: AnyRef]] '{ (a: ${tpe}) => ???} // error } diff --git a/tests/neg-macros/i8871b.scala b/tests/neg-macros/i8871b.scala index c61ff5850f8d..428c8e9e1bbc 100644 --- a/tests/neg-macros/i8871b.scala +++ b/tests/neg-macros/i8871b.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 } diff --git a/tests/neg-macros/i9801/Macro_1.scala b/tests/neg-macros/i9801/Macro_1.scala index 7ecfb3f9d2b3..b3749c3f8d72 100644 --- a/tests/neg-macros/i9801/Macro_1.scala +++ b/tests/neg-macros/i9801/Macro_1.scala @@ -11,11 +11,11 @@ def triggerStackOverflow(n: Int): Expr[Double] = { inline def loop(inline prog: Double): Double = ${impl('prog)} def impl(prog: Expr[Double])(using QuoteContext) : Expr[Double] = - import qctx.reflect._ + import reflect._ try { triggerStackOverflow(0) } catch { case e => - qctx.reflect.Reporting.error(e.getMessage, Term.of(prog).pos) + reflect.Reporting.error(e.getMessage, Term.of(prog).pos) '{ 42.0 } } diff --git a/tests/neg-macros/macros-in-same-project-6/Foo.scala b/tests/neg-macros/macros-in-same-project-6/Foo.scala index fbc55db03e72..e47c8d46c29a 100644 --- a/tests/neg-macros/macros-in-same-project-6/Foo.scala +++ b/tests/neg-macros/macros-in-same-project-6/Foo.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$") } diff --git a/tests/neg-macros/tasty-macro-assert-1/quoted_1.scala b/tests/neg-macros/tasty-macro-assert-1/quoted_1.scala index 80705144d1b2..619fafc9f60a 100644 --- a/tests/neg-macros/tasty-macro-assert-1/quoted_1.scala +++ b/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 = Term.of(cond) diff --git a/tests/neg-macros/tasty-macro-assert-2/quoted_1.scala b/tests/neg-macros/tasty-macro-assert-2/quoted_1.scala index 1874f51559ae..cb9d35c0fbe2 100644 --- a/tests/neg-macros/tasty-macro-assert-2/quoted_1.scala +++ b/tests/neg-macros/tasty-macro-assert-2/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 = Term.of(cond) diff --git a/tests/neg-macros/tasty-macro-error/quoted_1.scala b/tests/neg-macros/tasty-macro-error/quoted_1.scala index 7fb38746e70e..f9e5d6903629 100644 --- a/tests/neg-macros/tasty-macro-error/quoted_1.scala +++ b/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._ Reporting.error("here is the the argument is " + Term.of(x).underlyingArgument.show, Term.of(x).underlyingArgument.pos) '{} } diff --git a/tests/neg-macros/tasty-macro-positions/quoted_1.scala b/tests/neg-macros/tasty-macro-positions/quoted_1.scala index 7be2c8ac083f..7b132d49b6af 100644 --- a/tests/neg-macros/tasty-macro-positions/quoted_1.scala +++ b/tests/neg-macros/tasty-macro-positions/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 = Term.of(x).underlyingArgument.pos Reporting.error("here is the the argument is " + Term.of(x).underlyingArgument.show, pos) Reporting.error("here (+5) is the the argument is " + Term.of(x).underlyingArgument.show, pos.sourceFile, pos.start + 5, pos.end + 5) diff --git a/tests/neg-macros/tasty-string-interpolator-position-a/Macro_1.scala b/tests/neg-macros/tasty-string-interpolator-position-a/Macro_1.scala index e51b682c75ce..9fad3992e49a 100644 --- a/tests/neg-macros/tasty-string-interpolator-position-a/Macro_1.scala +++ b/tests/neg-macros/tasty-string-interpolator-position-a/Macro_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", Term.of(strCtxExpr).underlyingArgument.pos) '{ ($strCtxExpr).s($argsExpr: _*) } } diff --git a/tests/neg-macros/tasty-string-interpolator-position-b/Macro_1.scala b/tests/neg-macros/tasty-string-interpolator-position-b/Macro_1.scala index ea7187c55449..4f3c225f810a 100644 --- a/tests/neg-macros/tasty-string-interpolator-position-b/Macro_1.scala +++ b/tests/neg-macros/tasty-string-interpolator-position-b/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", Term.of(argsExpr).underlyingArgument.pos) '{ ($strCtxExpr).s($argsExpr: _*) } } diff --git a/tests/neg-staging/i5941/macro_1.scala b/tests/neg-staging/i5941/macro_1.scala index 167d7b7bc8a0..bae03f30e25c 100644 --- a/tests/neg-staging/i5941/macro_1.scala +++ b/tests/neg-staging/i5941/macro_1.scala @@ -13,7 +13,7 @@ object Lens { def impl[S: Type, T: Type](getter: Expr[S => T])(using qctx: QuoteContext): Expr[Lens[S, T]] = { implicit val toolbox: scala.quoted.staging.Toolbox = scala.quoted.staging.Toolbox.make(this.getClass.getClassLoader) - import qctx.reflect._ + import reflect._ import util._ // obj.copy(field = value) def setterBody(obj: Expr[S], value: Expr[T], field: String): Expr[S] = diff --git a/tests/pending/pos/cps-async-failure.scala b/tests/pending/pos/cps-async-failure.scala index e15375c2166b..c19badb7fa58 100644 --- a/tests/pending/pos/cps-async-failure.scala +++ b/tests/pending/pos/cps-async-failure.scala @@ -4,7 +4,7 @@ import scala.quoted._ trait App[F[_],CT]: this: Base[F,CT] => - import qctx.reflect._ + import reflect._ trait AA diff --git a/tests/pending/run/tasty-comments/quoted_1.scala b/tests/pending/run/tasty-comments/quoted_1.scala index d352083e694d..7df1ebf31365 100644 --- a/tests/pending/run/tasty-comments/quoted_1.scala +++ b/tests/pending/run/tasty-comments/quoted_1.scala @@ -7,7 +7,7 @@ object Macros { ${ impl('t) } def impl[T](x: Expr[T])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val tree = Term.of(x) tree.symbol.comment.map(_.raw) match { diff --git a/tests/pos-macros/i6171/Macro_1.scala b/tests/pos-macros/i6171/Macro_1.scala index dac7d12ac367..756f9abb1454 100644 --- a/tests/pos-macros/i6171/Macro_1.scala +++ b/tests/pos-macros/i6171/Macro_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(x: => Any): Unit = ${ assertImpl('x) } def assertImpl(x: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ Term.of(x).underlyingArgument '{ () } } diff --git a/tests/pos-macros/i6535/Macro_1.scala b/tests/pos-macros/i6535/Macro_1.scala index de0c7a887289..8fcd44d9e5fc 100644 --- a/tests/pos-macros/i6535/Macro_1.scala +++ b/tests/pos-macros/i6535/Macro_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition) } def assertImpl(cond: Expr[Boolean])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ import util._ import ValDef.let diff --git a/tests/pos-macros/i6803b/Macro_1.scala b/tests/pos-macros/i6803b/Macro_1.scala index b7d392939446..98a76b6e62a0 100644 --- a/tests/pos-macros/i6803b/Macro_1.scala +++ b/tests/pos-macros/i6803b/Macro_1.scala @@ -9,7 +9,7 @@ object AsObject { def unsafe(i: Int): LineNo = new LineNo(i) inline given x as LineNo = ${impl} private def impl(using qctx: QuoteContext) : Expr[LineNo] = { - import qctx.reflect._ + import reflect._ '{unsafe(${Expr(Position.ofMacroExpansion.startLine)})} } } diff --git a/tests/pos-macros/i7011/Macros_1.scala b/tests/pos-macros/i7011/Macros_1.scala index 48426d136a63..a69b4fa985f4 100644 --- a/tests/pos-macros/i7011/Macros_1.scala +++ b/tests/pos-macros/i7011/Macros_1.scala @@ -3,7 +3,7 @@ import scala.quoted._ inline def mcr(body: => Any): Unit = ${mcrImpl('body)} def mcrImpl[T](body: Expr[Any])(using QuoteContext) : Expr[Any] = { - import qctx.reflect._ + import reflect._ val bTree = Term.of(body) val under = bTree.underlyingArgument diff --git a/tests/pos-macros/i7030/Macros_1.scala b/tests/pos-macros/i7030/Macros_1.scala index 1f149f3e67e5..2bdacfb6b0c6 100644 --- a/tests/pos-macros/i7030/Macros_1.scala +++ b/tests/pos-macros/i7030/Macros_1.scala @@ -6,6 +6,6 @@ def innerImpl(exprs: Expr[Any])(using QuoteContext): Expr[Any] = inline def outer(expr: => Any): Any = ${outerImpl('expr)} def outerImpl(body: Expr[Any])(using QuoteContext): Expr[Any] = { - import qctx.reflect._ + import reflect._ Term.of(body).underlyingArgument.asExpr } diff --git a/tests/pos-macros/i7204.scala b/tests/pos-macros/i7204.scala index 9ca2a30f1a3c..d05b3a33d2f3 100644 --- a/tests/pos-macros/i7204.scala +++ b/tests/pos-macros/i7204.scala @@ -2,7 +2,7 @@ import scala.quoted._ object Foo { def impl(using qctx: QuoteContext) : Unit = { - import qctx.reflect._ + import reflect._ val Select(_, _) = (??? : Term) } } diff --git a/tests/pos-macros/i7887.scala b/tests/pos-macros/i7887.scala index 4fea06c24b4b..9cefb7ed13bf 100644 --- a/tests/pos-macros/i7887.scala +++ b/tests/pos-macros/i7887.scala @@ -1,5 +1,5 @@ def typed[A](using t: quoted.Type[A], qctx: quoted.QuoteContext): Unit = { - import qctx.reflect._ + import reflect._ '{ type T = A ${'{???}.asExprOf[T]} diff --git a/tests/pos-macros/i8325/Macro_1.scala b/tests/pos-macros/i8325/Macro_1.scala index 117388442a37..0ec97218acdb 100644 --- a/tests/pos-macros/i8325/Macro_1.scala +++ b/tests/pos-macros/i8325/Macro_1.scala @@ -12,7 +12,7 @@ object A: def pure[A](a:A):A = ??? def transformImplExpr[A:Type](using qctx: QuoteContext)(expr: Expr[A]): Expr[A] = { - import qctx.reflect._ + import reflect._ Term.of(expr) match { case Inlined(x,y,z) => transformImplExpr(z.asExpr.asInstanceOf[Expr[A]]) case Apply(fun,args) => '{ A.pure(${Apply(fun,args).asExpr.asInstanceOf[Expr[A]]}) } diff --git a/tests/pos-macros/i8325b/Macro_1.scala b/tests/pos-macros/i8325b/Macro_1.scala index ceb1ed51c488..4f23e1d37027 100644 --- a/tests/pos-macros/i8325b/Macro_1.scala +++ b/tests/pos-macros/i8325b/Macro_1.scala @@ -12,7 +12,7 @@ object A: def pure[A](a:A):A = ??? def transformImplExpr[A:Type](using qctx: QuoteContext)(expr: Expr[A]): Expr[A] = { - import qctx.reflect._ + import reflect._ Term.of(expr) match { case Inlined(x,y,z) => transformImplExpr(z.asExpr.asInstanceOf[Expr[A]]) case r@Apply(fun,args) => '{ diff --git a/tests/pos-macros/i8521/Macro_1.scala b/tests/pos-macros/i8521/Macro_1.scala index 716342dcd698..e72b3bdb4310 100644 --- a/tests/pos-macros/i8521/Macro_1.scala +++ b/tests/pos-macros/i8521/Macro_1.scala @@ -4,7 +4,7 @@ object Foo { inline def foo[T <: AnyKind]: String = ${ bar[T] } def bar[T <: AnyKind : Type](using qctx: QuoteContext): Expr[String] = { - import qctx.reflect._ + import reflect._ def packageToName(sym: Symbol): Unit = { if sym.isPackageDef then diff --git a/tests/pos-macros/i8651b.scala b/tests/pos-macros/i8651b.scala index 16e588160b0e..77589cdd27e9 100644 --- a/tests/pos-macros/i8651b.scala +++ b/tests/pos-macros/i8651b.scala @@ -9,7 +9,7 @@ object Macros { inline def coroutine[T](inline body: Any): Coroutine[T] = ${ coroutineImpl('{body}) } def coroutineImpl[T: Type](expr: Expr[_ <: Any])(using QuoteContext): Expr[Coroutine[T]] = { - import qctx.reflect._ + import reflect._ '{ new Coroutine[T] { diff --git a/tests/pos-macros/i8866/Macro_1.scala b/tests/pos-macros/i8866/Macro_1.scala index d56111015026..ba4dcccd2d49 100644 --- a/tests/pos-macros/i8866/Macro_1.scala +++ b/tests/pos-macros/i8866/Macro_1.scala @@ -12,7 +12,7 @@ object OtherMacro { object Macro { def impl(using qctx: QuoteContext): Expr[Int] = { - import qctx.reflect._ + import reflect._ ValDef.let( Symbol.currentOwner, diff --git a/tests/pos-macros/i8866b/Macro_1.scala b/tests/pos-macros/i8866b/Macro_1.scala index c5499b567b1b..a6822a040bcc 100644 --- a/tests/pos-macros/i8866b/Macro_1.scala +++ b/tests/pos-macros/i8866b/Macro_1.scala @@ -7,7 +7,7 @@ object Other { object Macro { def impl(using qctx: QuoteContext): Expr[Int] = { - import qctx.reflect._ + import reflect._ ValDef.let( Symbol.spliceOwner, diff --git a/tests/pos-macros/i8879/Macro_1.scala b/tests/pos-macros/i8879/Macro_1.scala index fbbcca60f116..5fa28b67ca85 100644 --- a/tests/pos-macros/i8879/Macro_1.scala +++ b/tests/pos-macros/i8879/Macro_1.scala @@ -6,7 +6,7 @@ object Test { def impl[T](t: T)(using qctx: QuoteContext, tt: Type[T]): Expr[Any] = { - import qctx.reflect._ + import reflect._ import util._ val foo = TypeRepr.of[Foo[String]] diff --git a/tests/pos-macros/i9240/Macro_1.scala b/tests/pos-macros/i9240/Macro_1.scala index 3a3cee0ecfc9..8d32c54b2b2b 100644 --- a/tests/pos-macros/i9240/Macro_1.scala +++ b/tests/pos-macros/i9240/Macro_1.scala @@ -3,7 +3,7 @@ import scala.quoted._ inline def diveInto[T]: String = ${ diveIntoImpl[T]() } def diveIntoImpl[T]()(implicit qctx: QuoteContext, ttype: Type[T]): Expr[String] = - import qctx.reflect._ + import reflect._ Expr( unwindType(TypeRepr.of[T]) ) def unwindType(using QuoteContext)(aType: qctx.reflect.TypeRepr): String = diff --git a/tests/pos-macros/i9251/Macro_1.scala b/tests/pos-macros/i9251/Macro_1.scala index 4c235609a3db..c096b606a47b 100644 --- a/tests/pos-macros/i9251/Macro_1.scala +++ b/tests/pos-macros/i9251/Macro_1.scala @@ -19,7 +19,7 @@ object Async { def checkPrintTypeImpl[F[_]:Type,T:Type](f: Expr[T])(using qctx: QuoteContext): Expr[Unit] = - import qctx.reflect._ + import reflect._ val fu = Term.of(f) fu match diff --git a/tests/pos-macros/i9518/Macro_1.scala b/tests/pos-macros/i9518/Macro_1.scala index e0d3ff7fd500..5d5eaad377be 100644 --- a/tests/pos-macros/i9518/Macro_1.scala +++ b/tests/pos-macros/i9518/Macro_1.scala @@ -6,7 +6,7 @@ trait CB[T] inline def shift : Unit = ${ shiftTerm } def shiftTerm(using QuoteContext): Expr[Unit] = { - import qctx.reflect._ + import reflect._ val nTree = Term.of('{ ??? : CB[Int] }) val tp1 = TypeRepr.of[CB[Int]] val tp2 = TypeRepr.of[([X] =>> CB[X])[Int]] diff --git a/tests/pos-macros/i9570.scala b/tests/pos-macros/i9570.scala index 03a2c7f15068..08b1203c64d0 100644 --- a/tests/pos-macros/i9570.scala +++ b/tests/pos-macros/i9570.scala @@ -8,7 +8,7 @@ object Macros { case object HNil extends HList private def sizeImpl(e: Expr[HList], n:Int)(using qctx:QuoteContext): Expr[Int] = { - import qctx.reflect._ + import reflect._ e match { case '{HCons(_,$t)} => // error if run with fatal warinings in BootstrappedOnlyCompilationTests sizeImpl(t,n+1) diff --git a/tests/pos-macros/i9687/Macro_1.scala b/tests/pos-macros/i9687/Macro_1.scala index 55262b8fa9e0..70e70ebb0aec 100644 --- a/tests/pos-macros/i9687/Macro_1.scala +++ b/tests/pos-macros/i9687/Macro_1.scala @@ -23,7 +23,7 @@ object X { } def transformImpl[A:Type](x:Expr[A])(using qctx: QuoteContext):Expr[A] = { - import qctx.reflect._ + import reflect._ val slowPath = Term.of('{ SlowPath }) val fastPath = Term.of('{ FastPath }) val transformer = new TreeMap() { diff --git a/tests/pos-macros/i9894/Macro_1.scala b/tests/pos-macros/i9894/Macro_1.scala index 8de97f0b53ba..7def5a6af987 100644 --- a/tests/pos-macros/i9894/Macro_1.scala +++ b/tests/pos-macros/i9894/Macro_1.scala @@ -21,7 +21,7 @@ object X: } def processImpl[T:Type](f:Expr[T])(using qctx: QuoteContext):Expr[CB[T]] = - import qctx.reflect._ + import reflect._ def transform(term:Term):Term = term match diff --git a/tests/pos-macros/scala2-macro-compat-1.scala b/tests/pos-macros/scala2-macro-compat-1.scala index 6fb83ab62dc4..4274984509b2 100644 --- a/tests/pos-macros/scala2-macro-compat-1.scala +++ b/tests/pos-macros/scala2-macro-compat-1.scala @@ -20,7 +20,7 @@ object LineNumberMacro2 { object LineNumberMacro3 { import scala.quoted._ def thisLineNumberExpr(using qctx: QuoteContext): Expr[Int] = { - import qctx.reflect._ + import reflect._ Expr(Position.ofMacroExpansion.startLine + 1) } } diff --git a/tests/pos-macros/tasty-constant-type/Macro_1.scala b/tests/pos-macros/tasty-constant-type/Macro_1.scala index 3d4288be1ccb..24ca95fdc669 100644 --- a/tests/pos-macros/tasty-constant-type/Macro_1.scala +++ b/tests/pos-macros/tasty-constant-type/Macro_1.scala @@ -7,7 +7,7 @@ object Macro { transparent inline def ff[A <: Int, B <: Int](): AddInt[A, B] = ${ impl[A, B] } def impl[A <: Int : Type, B <: Int : Type](using qctx: QuoteContext) : Expr[AddInt[A, B]] = { - import qctx.reflect._ + import reflect._ val ConstantType(Constant.Int(v1)) = TypeRepr.of[A] val ConstantType(Constant.Int(v2)) = TypeRepr.of[B] diff --git a/tests/pos-macros/treemap-unapply/Macro.scala b/tests/pos-macros/treemap-unapply/Macro.scala index ff6e5ac45d05..87b02128fbb2 100644 --- a/tests/pos-macros/treemap-unapply/Macro.scala +++ b/tests/pos-macros/treemap-unapply/Macro.scala @@ -2,7 +2,7 @@ import scala.quoted._ inline def mcr(x: => Unit): Unit = ${mcrImpl('x)} def mcrImpl(x: Expr[Unit])(using QuoteContext) : Expr[Unit] = - import qctx.reflect._ + import reflect._ val tr: Term = Term.of(x) object m extends TreeMap m.transformTerm(tr).asExprOf[Unit] diff --git a/tests/pos-special/fatal-warnings/tasty-parent-unapply.scala b/tests/pos-special/fatal-warnings/tasty-parent-unapply.scala index 5c9e3d770007..f8d5090320e0 100644 --- a/tests/pos-special/fatal-warnings/tasty-parent-unapply.scala +++ b/tests/pos-special/fatal-warnings/tasty-parent-unapply.scala @@ -4,7 +4,7 @@ object Macros { def impl(using QuoteContext): Unit = { - import qctx.reflect._ + import reflect._ def foo(tree: Tree, term: Term, typeTree: TypeTree, parent: Tree) = { diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala index fdb7fab3ea46..ff3dce3d9498 100644 --- a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala +++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala @@ -6,7 +6,7 @@ object Foo { ${ inspectBodyImpl('i) } def inspectBodyImpl(x: Expr[Int])(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ Term.of(x) match { case Inlined(None, Nil, arg) => Expr(arg.symbol.tree.showExtractors) case arg => Expr(arg.symbol.tree.showExtractors) // TODO should all by name parameters be in an inline node? diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala index d0ca25fbf60f..6deb86810e0a 100644 --- a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala +++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala @@ -6,7 +6,7 @@ object Foo { ${ inspectBodyImpl('i) } def inspectBodyImpl(x: Expr[Int])(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ Term.of(x) match { case Inlined(None, Nil, arg) => Expr(arg.symbol.tree.showExtractors) case arg => Expr(arg.symbol.tree.showExtractors) // TODO should all by name parameters be in an inline node? diff --git a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala index 02323ee90b99..ddfc223f33bc 100644 --- a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala +++ b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala @@ -6,7 +6,7 @@ object Macros { ${ impl('x) } def impl[T](x: Expr[T])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val buff = new StringBuilder @@ -19,7 +19,7 @@ object Macros { def myTraverser(using qctx: QuoteContext)(buff: StringBuilder): qctx.reflect.TreeTraverser = new { - import qctx.reflect._ + import reflect._ override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = { tree match { case tree @ DefDef(name, _, _, _, _) => diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala index 8b6ef3ebece7..ca7e5b5a8e40 100644 --- a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala +++ b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala @@ -7,7 +7,7 @@ object Foo { ${ inspectBodyImpl('i) } def inspectBodyImpl(x: Expr[Int])(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ def definitionString(sym: Symbol): Expr[String] = if sym.isClassDef || sym.isDefDef || sym.isValDef then Expr(sym.tree.showExtractors) diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala index 5b712377df1d..1651a251f5db 100644 --- a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala +++ b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala @@ -6,7 +6,7 @@ object Foo { ${ inspectBodyImpl('i) } def inspectBodyImpl(x: Expr[Int])(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ def definitionString(sym: Symbol): Expr[String] = if sym.isClassDef || sym.isDefDef || sym.isValDef then Expr(sym.tree.showExtractors) diff --git a/tests/run-custom-args/run-macros-erased/reflect-isFunctionType/macro_1.scala b/tests/run-custom-args/run-macros-erased/reflect-isFunctionType/macro_1.scala index 72114a3c9804..1ce3adeb75d1 100644 --- a/tests/run-custom-args/run-macros-erased/reflect-isFunctionType/macro_1.scala +++ b/tests/run-custom-args/run-macros-erased/reflect-isFunctionType/macro_1.scala @@ -4,7 +4,7 @@ import scala.quoted._ inline def isFunctionType[T]: Boolean = ${ isFunctionTypeImpl[T] } def isFunctionTypeImpl[T: Type](using qctx: QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ Expr(TypeRepr.of[T].isFunctionType) } @@ -12,7 +12,7 @@ def isFunctionTypeImpl[T: Type](using qctx: QuoteContext) : Expr[Boolean] = { inline def isContextFunctionType[T]: Boolean = ${ isContextFunctionTypeImpl[T] } def isContextFunctionTypeImpl[T: Type](using qctx: QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ Expr(TypeRepr.of[T].isContextFunctionType) } @@ -20,14 +20,14 @@ def isContextFunctionTypeImpl[T: Type](using qctx: QuoteContext) : Expr[Boolean] inline def isErasedFunctionType[T]: Boolean = ${ isErasedFunctionTypeImpl[T] } def isErasedFunctionTypeImpl[T: Type](using qctx: QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ Expr(TypeRepr.of[T].isErasedFunctionType) } inline def isDependentFunctionType[T]: Boolean = ${ isDependentFunctionTypeImpl[T] } def isDependentFunctionTypeImpl[T: Type](using qctx: QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ Expr(TypeRepr.of[T].isDependentFunctionType) } diff --git a/tests/run-custom-args/tasty-inspector/i8163.scala b/tests/run-custom-args/tasty-inspector/i8163.scala index 111907cb7895..beba782cc083 100644 --- a/tests/run-custom-args/tasty-inspector/i8163.scala +++ b/tests/run-custom-args/tasty-inspector/i8163.scala @@ -26,7 +26,7 @@ class TestInspector() extends TastyInspector: inspectClass(root) private def inspectClass(using QuoteContext)(tree: qctx.reflect.Tree): Unit = - import qctx.reflect._ + import reflect._ tree match { case t: PackageClause => t.stats.map( m => inspectClass(m) ) diff --git a/tests/run-custom-args/tasty-inspector/i8460.scala b/tests/run-custom-args/tasty-inspector/i8460.scala index 5324aa9601b0..1944c9e4510d 100644 --- a/tests/run-custom-args/tasty-inspector/i8460.scala +++ b/tests/run-custom-args/tasty-inspector/i8460.scala @@ -38,11 +38,11 @@ class TestInspector_Children() extends TastyInspector: var kids: List[String] = Nil protected def processCompilationUnit(using QuoteContext)(root: qctx.reflect.Tree): Unit = - import qctx.reflect._ + import reflect._ inspectClass(root) private def inspectClass(using QuoteContext)(tree: qctx.reflect.Tree): Unit = - import qctx.reflect._ + import reflect._ tree match { case t: PackageClause => t.stats.map( m => inspectClass(m) ) diff --git a/tests/run-custom-args/tasty-inspector/tasty-documentation-inspector/Test.scala b/tests/run-custom-args/tasty-inspector/tasty-documentation-inspector/Test.scala index 8074e11480c3..94c155010bc2 100644 --- a/tests/run-custom-args/tasty-inspector/tasty-documentation-inspector/Test.scala +++ b/tests/run-custom-args/tasty-inspector/tasty-documentation-inspector/Test.scala @@ -16,7 +16,7 @@ object Test { class DocumentationInspector extends TastyInspector { protected def processCompilationUnit(using QuoteContext)(root: qctx.reflect.Tree): Unit = { - import qctx.reflect._ + import reflect._ object Traverser extends TreeTraverser { override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match { diff --git a/tests/run-custom-args/tasty-inspector/tasty-inspector/Test.scala b/tests/run-custom-args/tasty-inspector/tasty-inspector/Test.scala index b3c608b9241d..732f0aa6f97d 100644 --- a/tests/run-custom-args/tasty-inspector/tasty-inspector/Test.scala +++ b/tests/run-custom-args/tasty-inspector/tasty-inspector/Test.scala @@ -16,7 +16,7 @@ object Test { class DBInspector extends TastyInspector { protected def processCompilationUnit(using QuoteContext)(root: qctx.reflect.Tree): Unit = { - import qctx.reflect._ + import reflect._ object Traverser extends TreeTraverser { override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match { diff --git a/tests/run-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala b/tests/run-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala index 2d3809e0f461..0b7b854fc738 100644 --- a/tests/run-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala +++ b/tests/run-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala @@ -6,7 +6,7 @@ import scala.tasty.inspector.TastyInspector class TastyInterpreter extends TastyInspector { protected def processCompilationUnit(using QuoteContext)(root: qctx.reflect.Tree): Unit = { - import qctx.reflect._ + import reflect._ object Traverser extends TreeTraverser { override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match { diff --git a/tests/run-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala b/tests/run-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala index 8eb690b35482..2ff1f907b37d 100644 --- a/tests/run-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala +++ b/tests/run-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala @@ -4,7 +4,7 @@ import scala.quoted._ import scala.tasty.interpreter.jvm.JVMReflection abstract class TreeInterpreter[QCtx <: QuoteContext & Singleton](using val qctx: QCtx) { - import qctx.reflect._ + import reflect._ final val LOG = false diff --git a/tests/run-custom-args/tasty-interpreter/interpreter/jvm/JVMReflection.scala b/tests/run-custom-args/tasty-interpreter/interpreter/jvm/JVMReflection.scala index be66762a7756..bcfc510d93d2 100644 --- a/tests/run-custom-args/tasty-interpreter/interpreter/jvm/JVMReflection.scala +++ b/tests/run-custom-args/tasty-interpreter/interpreter/jvm/JVMReflection.scala @@ -3,7 +3,7 @@ package scala.tasty.interpreter.jvm import scala.quoted._ class JVMReflection[QCtx <: QuoteContext & Singleton](using val tasty: QCtx) { - import qctx.reflect._ + import reflect._ import java.lang.reflect.{InvocationTargetException, Method} private val classLoader: ClassLoader = getClass.getClassLoader diff --git a/tests/run-macros/f-interpolation-1/FQuote_1.scala b/tests/run-macros/f-interpolation-1/FQuote_1.scala index 5044646b63e1..f03590ee6487 100644 --- a/tests/run-macros/f-interpolation-1/FQuote_1.scala +++ b/tests/run-macros/f-interpolation-1/FQuote_1.scala @@ -9,7 +9,7 @@ object FQuote { } /*private*/ def impl(receiver: Expr[SCOps], args: Expr[Seq[Any]])(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ def liftListOfAny(lst: List[Term]): Expr[List[Any]] = lst match { case x :: xs => diff --git a/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala b/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala index 51c619da310e..731ba61400f4 100644 --- a/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala +++ b/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala @@ -7,28 +7,28 @@ object TypeToolbox { /** are the two types equal? */ inline def =:=[A, B]: Boolean = ${tpEqImpl[A, B]} private def tpEqImpl[A: Type, B: Type](using qctx: QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ Expr(TypeRepr.of[A] =:= TypeRepr.of[B]) } /** is `tp1` a subtype of `tp2` */ inline def <:<[A, B]: Boolean = ${tpLEqImpl[A, B]} private def tpLEqImpl[A: Type, B: Type](using qctx: QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ Expr(TypeRepr.of[A] <:< TypeRepr.of[B]) } /** type associated with the tree */ inline def typeOf[T, Expected](a: T): Boolean = ${typeOfImpl[T, Expected]('a)} private def typeOfImpl[A: Type, E: Type](a: Expr[A])(using qctx: QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ Expr(TypeRepr.of[A] =:= TypeRepr.of[E]) } /** does the type refer to a case class? */ inline def isCaseClass[A]: Boolean = ${isCaseClassImpl[A]} private def isCaseClassImpl[T: Type](using qctx: QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ val sym = TypeTree.of[T].symbol Expr(sym.isClassDef && sym.flags.is(Flags.Case)) } @@ -36,66 +36,66 @@ object TypeToolbox { /** val fields of a case class Type -- only the ones declared in primary constructor */ inline def caseFields[T]: List[String] = ${caseFieldsImpl[T]} private def caseFieldsImpl[T: Type](using qctx: QuoteContext) : Expr[List[String]] = { - import qctx.reflect._ + import reflect._ val fields = TypeTree.of[T].symbol.caseFields.map(_.name) Expr(fields) } inline def fieldIn[T](inline mem: String): String = ${fieldInImpl[T]('mem)} private def fieldInImpl[T: Type](mem: Expr[String])(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ val field = TypeTree.of[T].symbol.field(mem.unliftOrError) Expr(if field.isNoSymbol then "" else field.name) } inline def fieldsIn[T]: Seq[String] = ${fieldsInImpl[T]} private def fieldsInImpl[T: Type](using qctx: QuoteContext) : Expr[Seq[String]] = { - import qctx.reflect._ + import reflect._ val fields = TypeTree.of[T].symbol.fields Expr(fields.map(_.name).toList) } inline def methodIn[T](inline mem: String): Seq[String] = ${methodInImpl[T]('mem)} private def methodInImpl[T: Type](mem: Expr[String])(using qctx: QuoteContext) : Expr[Seq[String]] = { - import qctx.reflect._ + import reflect._ Expr(TypeTree.of[T].symbol.classMethod(mem.unliftOrError).map(_.name)) } inline def methodsIn[T]: Seq[String] = ${methodsInImpl[T]} private def methodsInImpl[T: Type](using qctx: QuoteContext) : Expr[Seq[String]] = { - import qctx.reflect._ + import reflect._ Expr(TypeTree.of[T].symbol.classMethods.map(_.name)) } inline def method[T](inline mem: String): Seq[String] = ${methodImpl[T]('mem)} private def methodImpl[T: Type](mem: Expr[String])(using qctx: QuoteContext) : Expr[Seq[String]] = { - import qctx.reflect._ + import reflect._ Expr(TypeTree.of[T].symbol.method(mem.unliftOrError).map(_.name)) } inline def methods[T]: Seq[String] = ${methodsImpl[T]} private def methodsImpl[T: Type](using qctx: QuoteContext) : Expr[Seq[String]] = { - import qctx.reflect._ + import reflect._ Expr(TypeTree.of[T].symbol.methods.map(_.name)) } inline def typeTag[T](x: T): String = ${typeTagImpl[T]} private def typeTagImpl[T: Type](using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ val res = TypeRepr.of[T].show Expr(res) } inline def companion[T1, T2]: Boolean = ${companionImpl[T1, T2]} private def companionImpl[T1: Type, T2: Type](using qctx: QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ val res = TypeTree.of[T1].symbol.companionModule == TypeTree.of[T2].symbol Expr(res) } inline def companionName[T1]: String = ${companionNameImpl[T1]} private def companionNameImpl[T: Type](using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ val sym = TypeTree.of[T].symbol val companionClass = if sym.isClassDef then sym.companionModule.companionClass diff --git a/tests/run-macros/i10011/Macro_1.scala b/tests/run-macros/i10011/Macro_1.scala index 50865d8b760b..b5891a41037a 100644 --- a/tests/run-macros/i10011/Macro_1.scala +++ b/tests/run-macros/i10011/Macro_1.scala @@ -4,6 +4,6 @@ inline def printPos[T](inline expr: T): (Int, Int) = ${ printPos('expr) } private def printPos[T](expr: Expr[T])(using QuoteContext): Expr[(Int, Int)] = - import qctx.reflect._ + import reflect._ val pos = Term.of(expr).pos Expr((pos.start, pos.end)) diff --git a/tests/run-macros/i5119/Macro_1.scala b/tests/run-macros/i5119/Macro_1.scala index 10e66109a2e7..94547a7b2970 100644 --- a/tests/run-macros/i5119/Macro_1.scala +++ b/tests/run-macros/i5119/Macro_1.scala @@ -6,7 +6,7 @@ object Macro { } implicit inline def XmlQuote(inline sc: StringContext): StringContextOps = new StringContextOps(sc) def impl(sc: Expr[StringContext], args: Expr[Seq[Any]])(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ Expr(Term.of(sc).underlyingArgument.showExtractors + "\n" + Term.of(args).underlyingArgument.showExtractors) } } diff --git a/tests/run-macros/i5119b/Macro_1.scala b/tests/run-macros/i5119b/Macro_1.scala index 6345e27150f2..ecd35e3aa350 100644 --- a/tests/run-macros/i5119b/Macro_1.scala +++ b/tests/run-macros/i5119b/Macro_1.scala @@ -6,7 +6,7 @@ object Macro { inline def ff(arg1: Any, arg2: Any): String = ${ Macro.impl('{arg1}, '{arg2}) } def impl(arg1: Expr[Any], arg2: Expr[Any])(using qctx: QuoteContext) : Expr[String] = - import qctx.reflect._ + import reflect._ Expr(Term.of(arg1).underlyingArgument.showExtractors + "\n" + Term.of(arg2).underlyingArgument.showExtractors) } diff --git a/tests/run-macros/i5533/Macro_1.scala b/tests/run-macros/i5533/Macro_1.scala index b12a0af99c33..cb4e42ec47a3 100644 --- a/tests/run-macros/i5533/Macro_1.scala +++ b/tests/run-macros/i5533/Macro_1.scala @@ -8,7 +8,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${assertImpl('condition)} def assertImpl(condition: Expr[Boolean])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val tree = Term.of(condition) diff --git a/tests/run-macros/i5533b/Macro_1.scala b/tests/run-macros/i5533b/Macro_1.scala index 1dbc0d303c84..f41625555ef1 100644 --- a/tests/run-macros/i5533b/Macro_1.scala +++ b/tests/run-macros/i5533b/Macro_1.scala @@ -7,7 +7,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${assertImpl('condition)} def assertImpl(condition: Expr[Boolean])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val tree = Term.of(condition) def exprStr: String = condition.show diff --git a/tests/run-macros/i5536/Macro_1.scala b/tests/run-macros/i5536/Macro_1.scala index d09e9faa5231..717cee337e83 100644 --- a/tests/run-macros/i5536/Macro_1.scala +++ b/tests/run-macros/i5536/Macro_1.scala @@ -4,7 +4,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${assertImpl('condition)} def assertImpl(condition: Expr[Boolean])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val tree = Term.of(condition) def exprStr: String = condition.show diff --git a/tests/run-macros/i5629/Macro_1.scala b/tests/run-macros/i5629/Macro_1.scala index 1bc340db8719..7e26dcd61fc4 100644 --- a/tests/run-macros/i5629/Macro_1.scala +++ b/tests/run-macros/i5629/Macro_1.scala @@ -5,7 +5,7 @@ object Macros { inline def assert(condition: => Boolean): Unit = ${ assertImpl('{condition}, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val b = Term.of(cond).underlyingArgument.asExprOf[Boolean] '{ scala.Predef.assert($b) } } @@ -13,7 +13,7 @@ object Macros { inline def thisLineNumber = ${ thisLineNumberImpl } def thisLineNumberImpl(using qctx: QuoteContext) : Expr[Int] = { - import qctx.reflect._ + import reflect._ Expr(Position.ofMacroExpansion.startLine) } } diff --git a/tests/run-macros/i5715/Macro_1.scala b/tests/run-macros/i5715/Macro_1.scala index 77cb8bc1457b..081fc6e7e8a3 100644 --- a/tests/run-macros/i5715/Macro_1.scala +++ b/tests/run-macros/i5715/Macro_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ Term.of(cond).underlyingArgument match { case app @ Apply(select @ Select(lhs, op), rhs :: Nil) => diff --git a/tests/run-macros/i5941/macro_1.scala b/tests/run-macros/i5941/macro_1.scala index 7ebacbe25b89..6026bdaad30d 100644 --- a/tests/run-macros/i5941/macro_1.scala +++ b/tests/run-macros/i5941/macro_1.scala @@ -12,7 +12,7 @@ object Lens { } def impl[S: Type, T: Type](getter: Expr[S => T])(using qctx: QuoteContext) : Expr[Lens[S, T]] = { - import qctx.reflect._ + import reflect._ import util._ // obj.copy(a = obj.a.copy(b = a.b.copy(c = v))) @@ -85,7 +85,7 @@ object Iso { } def impl[S: Type, A: Type](using qctx: QuoteContext) : Expr[Iso[S, A]] = { - import qctx.reflect._ + import reflect._ import util._ val tpS = TypeRepr.of[S] @@ -124,7 +124,7 @@ object Iso { } def implUnit[S: Type](using qctx: QuoteContext) : Expr[Iso[S, 1]] = { - import qctx.reflect._ + import reflect._ import util._ val tpS = TypeRepr.of[S] @@ -196,7 +196,7 @@ object Prism { } def impl[S: Type, A <: S : Type](using qctx: QuoteContext) : Expr[Prism[S, A]] = { - import qctx.reflect._ + import reflect._ import util._ '{ diff --git a/tests/run-macros/i6171/Macro_1.scala b/tests/run-macros/i6171/Macro_1.scala index 9a18094e9562..cd725aaed73a 100644 --- a/tests/run-macros/i6171/Macro_1.scala +++ b/tests/run-macros/i6171/Macro_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ import util._ def isImplicitMethodType(tp: TypeRepr): Boolean = tp match diff --git a/tests/run-macros/i6518/Macro_1.scala b/tests/run-macros/i6518/Macro_1.scala index 99f65738c744..9efe7c953acf 100644 --- a/tests/run-macros/i6518/Macro_1.scala +++ b/tests/run-macros/i6518/Macro_1.scala @@ -5,7 +5,7 @@ object Macros { inline def test(): String = ${ testImpl } private def testImpl(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ val classSym = TypeRepr.of[Function1].classSymbol.get classSym.classMethod("apply") classSym.classMethods diff --git a/tests/run-macros/i6679/Macro_1.scala b/tests/run-macros/i6679/Macro_1.scala index 0130c9ebbb90..47e39138986e 100644 --- a/tests/run-macros/i6679/Macro_1.scala +++ b/tests/run-macros/i6679/Macro_1.scala @@ -1,7 +1,7 @@ import scala.quoted._ def makeMatch[A: Type](head : Expr[A])(using qctx : QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val sacrifice = '{ $head match { case _ => ??? } } Term.of(sacrifice) diff --git a/tests/run-macros/i6765/Macro_1.scala b/tests/run-macros/i6765/Macro_1.scala index 42fc5ef368f9..1c2374dcb3d8 100644 --- a/tests/run-macros/i6765/Macro_1.scala +++ b/tests/run-macros/i6765/Macro_1.scala @@ -3,7 +3,7 @@ import scala.quoted._ inline def foo = ${fooImpl} def fooImpl(using qctx: QuoteContext) = { - import qctx.reflect._ + import reflect._ val res = Expr.ofList(List('{"One"})) Expr(res.show) } diff --git a/tests/run-macros/i6803/Macro_1.scala b/tests/run-macros/i6803/Macro_1.scala index e6164054d348..89b0fb760d67 100644 --- a/tests/run-macros/i6803/Macro_1.scala +++ b/tests/run-macros/i6803/Macro_1.scala @@ -9,7 +9,7 @@ object AsObject { def unsafe(i: Int): LineNo = new LineNo(i) inline given LineNo = ${impl} private def impl(using qctx: QuoteContext): Expr[LineNo] = { - import qctx.reflect._ + import reflect._ '{unsafe(${Expr(Position.ofMacroExpansion.startLine)})} } } @@ -21,7 +21,7 @@ package AsPackage { def unsafe(i: Int): LineNo = new LineNo(i) inline given LineNo = ${impl} private def impl(using qctx: QuoteContext): Expr[LineNo] = { - import qctx.reflect._ + import reflect._ '{unsafe(${Expr(Position.ofMacroExpansion.startLine)})} } } diff --git a/tests/run-macros/i6988/FirstArg_1.scala b/tests/run-macros/i6988/FirstArg_1.scala index deb231c7d47b..c7b26a28769a 100644 --- a/tests/run-macros/i6988/FirstArg_1.scala +++ b/tests/run-macros/i6988/FirstArg_1.scala @@ -9,7 +9,7 @@ object Macros { import scala.quoted._ def argsImpl(using qctx: QuoteContext) : Expr[FirstArg] = { - import qctx.reflect._ + import reflect._ def enclosingClass(cur: Symbol = Symbol.currentOwner): Symbol = if (cur.isClassDef) cur diff --git a/tests/run-macros/i7008/macro_1.scala b/tests/run-macros/i7008/macro_1.scala index a371f66fb25e..0d662973e46c 100644 --- a/tests/run-macros/i7008/macro_1.scala +++ b/tests/run-macros/i7008/macro_1.scala @@ -11,7 +11,7 @@ def mcrProxy(expr: Expr[Boolean])(using QuoteContext): Expr[Unit] = { } def mcrImpl[T](func: Expr[Seq[Box[T]] => Unit], expr: Expr[T])(using QuoteContext, Type[T]): Expr[Unit] = { - import qctx.reflect._ + import reflect._ val arg = Varargs(Seq('{(Box($expr))})) Expr.betaReduce('{$func($arg)}) } diff --git a/tests/run-macros/i7025/Macros_1.scala b/tests/run-macros/i7025/Macros_1.scala index e46982917e3c..fec93ff3ee8c 100644 --- a/tests/run-macros/i7025/Macros_1.scala +++ b/tests/run-macros/i7025/Macros_1.scala @@ -4,7 +4,7 @@ object Macros { inline def debug: Unit = ${Macros.debugImpl} def debugImpl(using qctx: QuoteContext): Expr[Unit] = { - import qctx.reflect._ + import reflect._ def nearestEnclosingDef(owner: Symbol): Symbol = if owner.isClassDef then owner diff --git a/tests/run-macros/i7887/Macro_1.scala b/tests/run-macros/i7887/Macro_1.scala index f60309685b60..97dfdb470f0a 100644 --- a/tests/run-macros/i7887/Macro_1.scala +++ b/tests/run-macros/i7887/Macro_1.scala @@ -1,5 +1,7 @@ +import scala.quoted.reflect + def myMacroImpl(a: quoted.Expr[_])(using qctx: quoted.QuoteContext) = { - import qctx.reflect._ + import reflect._ def typed[A] = { implicit val t: quoted.Type[A] = Term.of(a).tpe.widen.asType.asInstanceOf[quoted.Type[A]] '{ diff --git a/tests/run-macros/i7898/Macro_1.scala b/tests/run-macros/i7898/Macro_1.scala index 8adfca1bf010..599998ebe966 100644 --- a/tests/run-macros/i7898/Macro_1.scala +++ b/tests/run-macros/i7898/Macro_1.scala @@ -3,7 +3,7 @@ import scala.quoted._ object Main { def myMacroImpl(body: Expr[_])(using qctx: QuoteContext) : Expr[_] = { - import qctx.reflect._ + import reflect._ val bodyTerm = Term.of(underlyingArgument(body)) val showed = bodyTerm.show '{ @@ -17,6 +17,6 @@ object Main { } def underlyingArgument[T](expr: Expr[T])(using qctx: QuoteContext): Expr[T] = - import qctx.reflect._ + import reflect._ Term.of(expr).underlyingArgument.asExpr.asInstanceOf[Expr[T]] } diff --git a/tests/run-macros/i8007/Macro_1.scala b/tests/run-macros/i8007/Macro_1.scala index 24a829c3cedc..9f13289d546c 100644 --- a/tests/run-macros/i8007/Macro_1.scala +++ b/tests/run-macros/i8007/Macro_1.scala @@ -17,7 +17,7 @@ object Macro1 { ${ test1Impl('value) } def test1Impl[T: Type](value: Expr[T])(using qctx: QuoteContext): Expr[List[String]] = { - import qctx.reflect._ + import reflect._ val mirrorTpe = Type.of[Mirror.Of[T]] diff --git a/tests/run-macros/i8007/Macro_2.scala b/tests/run-macros/i8007/Macro_2.scala index 06576f8953fe..009db22c85b4 100644 --- a/tests/run-macros/i8007/Macro_2.scala +++ b/tests/run-macros/i8007/Macro_2.scala @@ -21,7 +21,7 @@ object Macro2 { } def derived[T: Type](ev: Expr[Mirror.Of[T]])(using qctx: QuoteContext): Expr[JsonEncoder[T]] = { - import qctx.reflect._ + import reflect._ val fields = ev match { case '{ $m: Mirror.ProductOf[T] { type MirroredElemLabels = labels } } => @@ -43,7 +43,7 @@ object Macro2 { inline def test2[T](value: =>T): Unit = ${ test2Impl('value) } def test2Impl[T: Type](value: Expr[T])(using qctx: QuoteContext): Expr[Unit] = { - import qctx.reflect._ + import reflect._ val mirrorTpe = Type.of[Mirror.Of[T]] val mirrorExpr = Expr.summon(using mirrorTpe).get diff --git a/tests/run-macros/i8007/Macro_3.scala b/tests/run-macros/i8007/Macro_3.scala index 2cfde64538ec..9954975f1066 100644 --- a/tests/run-macros/i8007/Macro_3.scala +++ b/tests/run-macros/i8007/Macro_3.scala @@ -33,7 +33,7 @@ object Eq { } given derived[T: Type](using qctx: QuoteContext) as Expr[Eq[T]] = { - import qctx.reflect._ + import reflect._ val ev: Expr[Mirror.Of[T]] = Expr.summon(using Type.of[Mirror.Of[T]]).get diff --git a/tests/run-macros/i8514/Macro_1.scala b/tests/run-macros/i8514/Macro_1.scala index 44257052ae69..80d1ae6194c9 100644 --- a/tests/run-macros/i8514/Macro_1.scala +++ b/tests/run-macros/i8514/Macro_1.scala @@ -7,7 +7,7 @@ class C extends B inline def test(): Unit = ${ testExpr } def testExpr(using QuoteContext): Expr[Unit] = { - import qctx.reflect._ + import reflect._ '{ println(${Expr(TypeRepr.of[Object].baseClasses.toString)}) diff --git a/tests/run-macros/i8514b/Macro_1.scala b/tests/run-macros/i8514b/Macro_1.scala index 75540acc556d..ca91f18db9fe 100644 --- a/tests/run-macros/i8514b/Macro_1.scala +++ b/tests/run-macros/i8514b/Macro_1.scala @@ -7,7 +7,7 @@ class B extends A[P, String] inline def test(): Unit = ${ testExpr } def testExpr(using QuoteContext): Expr[Unit] = { - import qctx.reflect._ + import reflect._ val t = TypeRepr.of[B] val baseTypes = t.baseClasses.map(b => t.baseType(b)) diff --git a/tests/run-macros/i8520/Macro_1.scala b/tests/run-macros/i8520/Macro_1.scala index 74100f7b7560..b00daf4f208e 100644 --- a/tests/run-macros/i8520/Macro_1.scala +++ b/tests/run-macros/i8520/Macro_1.scala @@ -3,7 +3,7 @@ import scala.quoted._ inline def test[T[_]]: Unit = ${ testExpr[T] } def testExpr[T[_]: Type](using QuoteContext): Expr[Unit] = { - import qctx.reflect._ + import reflect._ def variance(f: Flags) = if f.is(Flags.Covariant) then "+" else if f.is(Flags.Contravariant) then "-" diff --git a/tests/run-macros/i9206/Macros_1.scala b/tests/run-macros/i9206/Macros_1.scala index 21f35e641d0c..72f9507d5586 100644 --- a/tests/run-macros/i9206/Macros_1.scala +++ b/tests/run-macros/i9206/Macros_1.scala @@ -5,7 +5,7 @@ object Inspect { inline def inspect[T <: AnyKind]: String = ${ inspectTpe[T] } def inspectTpe[T <: AnyKind: Type](using QuoteContext): Expr[String] = { - import qctx.reflect.TypeRepr + import reflect.TypeRepr val tree = TypeRepr.of[T].typeSymbol.tree Expr(tree.show) } diff --git a/tests/run-macros/i9570/Macro_1.scala b/tests/run-macros/i9570/Macro_1.scala index 5bdfc9709cee..2b798c0878c0 100644 --- a/tests/run-macros/i9570/Macro_1.scala +++ b/tests/run-macros/i9570/Macro_1.scala @@ -8,7 +8,7 @@ object Macros { case object HNil extends HList private def sizeImpl(e: Expr[HList], n:Int)(using qctx:QuoteContext): Expr[Int] = { - import qctx.reflect._ + import reflect._ e match { case '{HCons($_,$t)} => //case '{HCons($a,$t)} => diff --git a/tests/run-macros/i9812b/Macro_1.scala b/tests/run-macros/i9812b/Macro_1.scala index 1f44e602257b..da0e51bb2a3f 100644 --- a/tests/run-macros/i9812b/Macro_1.scala +++ b/tests/run-macros/i9812b/Macro_1.scala @@ -28,7 +28,7 @@ case object NIL extends Lst[Nothing] given IntLiftable[T <: Int] as Liftable[T]: def toExpr(x: T): QuoteContext ?=> Expr[T] = (using qctx) => { - import qctx.reflect._ + import reflect._ Literal(Constant.Int(x)).asExpr.asInstanceOf[Expr[T]] } diff --git a/tests/run-macros/inferred-repeated-result/test_1.scala b/tests/run-macros/inferred-repeated-result/test_1.scala index 84cc75055e80..bdc47817c23c 100644 --- a/tests/run-macros/inferred-repeated-result/test_1.scala +++ b/tests/run-macros/inferred-repeated-result/test_1.scala @@ -3,7 +3,7 @@ object Macros { inline def go[T](inline t: T) = ${ impl('t) } def impl[T](expr: Expr[T])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val tree = Term.of(expr) diff --git a/tests/run-macros/no-symbol/1.scala b/tests/run-macros/no-symbol/1.scala index 931938df3cb3..392e6199ed13 100644 --- a/tests/run-macros/no-symbol/1.scala +++ b/tests/run-macros/no-symbol/1.scala @@ -9,7 +9,7 @@ object Macro { ${ fooImpl[T] } def fooImpl[T](implicit t: Type[T], qctx: QuoteContext): Expr[String] = { - import qctx.reflect._ + import reflect._ val sym = TypeTree.of[T].symbol if sym.isClassDef then '{ "symbol" } else if sym.isNoSymbol then '{ "no symbol" } diff --git a/tests/run-macros/paramSymss/Macro_1.scala b/tests/run-macros/paramSymss/Macro_1.scala index 6a7efc1c5154..a10b838b5358 100644 --- a/tests/run-macros/paramSymss/Macro_1.scala +++ b/tests/run-macros/paramSymss/Macro_1.scala @@ -4,7 +4,7 @@ inline def showParamSyms(inline x: Any): String = ${ showParamSymsExpr('x) } def showParamSymsExpr(using QuoteContext)(x: Expr[Any]): Expr[String] = - import qctx.reflect._ + import reflect._ val '{ $y: Any } = x // Drop Inlined not to access the symbol val sym = Term.of(y).symbol Expr( diff --git a/tests/run-macros/quote-inline-function/quoted_1.scala b/tests/run-macros/quote-inline-function/quoted_1.scala index 6d55dba715dd..44ca74b9a374 100644 --- a/tests/run-macros/quote-inline-function/quoted_1.scala +++ b/tests/run-macros/quote-inline-function/quoted_1.scala @@ -7,7 +7,7 @@ object Macros { inline def foreach3(start: Int, end: Int, inline f: Int => Unit): String = ${impl('start, 'end, 'f)} def impl(start: Expr[Int], end: Expr[Int], f: Expr[Int => Unit])(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ val res = '{ var i = $start val j = $end diff --git a/tests/run-macros/quote-matcher-runtime/quoted_1.scala b/tests/run-macros/quote-matcher-runtime/quoted_1.scala index cf3389c8f89e..875915122a37 100644 --- a/tests/run-macros/quote-matcher-runtime/quoted_1.scala +++ b/tests/run-macros/quote-matcher-runtime/quoted_1.scala @@ -5,7 +5,7 @@ object Macros { inline def matches[A, B](inline a: A, inline b: B): Unit = ${impl('a, 'b)} private def impl[A, B](a: Expr[A], b: Expr[B])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val res = qctx.asInstanceOf[scala.quoted.internal.QuoteMatching].ExprMatch.unapply[Tuple, Tuple](a)(using b).map { tup => tup.toArray.toList.map { diff --git a/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala index bbb3d709999a..3717ff3cf079 100644 --- a/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala +++ b/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala @@ -20,7 +20,7 @@ object Macros { '{ $sym.times(${lift(x)}, ${lift(y)}) } case _ => - import qctx.reflect._ + import reflect._ Reporting.error("Expected explicit DSL", Term.of(e).pos) '{ ??? } diff --git a/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala index 3eaab424b6e4..eda3ed9721d4 100644 --- a/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala +++ b/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala @@ -38,7 +38,7 @@ object Macros { case '{ envVar(${Const(i)}) } => env(i) case _ => - import qctx.reflect._ + import reflect._ Reporting.error("Expected explicit DSL " + e.show, Term.of(e).pos) ??? } @@ -52,7 +52,7 @@ object Macros { } ) case _ => - import qctx.reflect._ + import reflect._ Reporting.error("Expected explicit DSL => DSL " + e.show, Term.of(e).pos) ??? } @@ -64,18 +64,18 @@ object Macros { object UnsafeExpr { def open[T1, R, X](f: Expr[T1 => R])(content: (Expr[R], [t] => Expr[t] => Expr[T1] => Expr[t]) => X)(using qctx: QuoteContext): X = { - import qctx.reflect._ + import reflect._ val (params, bodyExpr) = paramsAndBody[R](f) content(bodyExpr, [t] => (e: Expr[t]) => (v: Expr[T1]) => bodyFn[t](Term.of(e), params, List(Term.of(v))).asExpr.asInstanceOf[Expr[t]]) } private def paramsAndBody[R](using qctx: QuoteContext)(f: Expr[Any]): (List[qctx.reflect.ValDef], Expr[R]) = { - import qctx.reflect._ + import reflect._ val Block(List(DefDef("$anonfun", Nil, List(params), _, Some(body))), Closure(Ident("$anonfun"), None)) = Term.of(f).etaExpand(Symbol.currentOwner) (params, body.asExpr.asInstanceOf[Expr[R]]) } private def bodyFn[t](using qctx: QuoteContext)(e: qctx.reflect.Term, params: List[qctx.reflect.ValDef], args: List[qctx.reflect.Term]): qctx.reflect.Term = { - import qctx.reflect._ + import reflect._ val map = params.map(_.symbol).zip(args).toMap new TreeMap { override def transformTerm(tree: Term)(using ctx: Context): Term = diff --git a/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala index a9e787b8cb1e..f4f727ebd510 100644 --- a/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala +++ b/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala @@ -76,18 +76,18 @@ object Macros { object UnsafeExpr { def open[T1, R, X](f: Expr[T1 => R])(content: (Expr[R], [t] => Expr[t] => Expr[T1] => Expr[t]) => X)(using qctx: QuoteContext): X = { - import qctx.reflect._ + import reflect._ val (params, bodyExpr) = paramsAndBody[R](f) content(bodyExpr, [t] => (e: Expr[t]) => (v: Expr[T1]) => bodyFn[t](Term.of(e), params, List(Term.of(v))).asExpr.asInstanceOf[Expr[t]]) } private def paramsAndBody[R](using qctx: QuoteContext)(f: Expr[Any]): (List[qctx.reflect.ValDef], Expr[R]) = { - import qctx.reflect._ + import reflect._ val Block(List(DefDef("$anonfun", Nil, List(params), _, Some(body))), Closure(Ident("$anonfun"), None)) = Term.of(f).etaExpand(Symbol.currentOwner) (params, body.asExpr.asInstanceOf[Expr[R]]) } private def bodyFn[t](using qctx: QuoteContext)(e: qctx.reflect.Term, params: List[qctx.reflect.ValDef], args: List[qctx.reflect.Term]): qctx.reflect.Term = { - import qctx.reflect._ + import reflect._ val map = params.map(_.symbol).zip(args).toMap new TreeMap { override def transformTerm(tree: Term)(using ctx: Context): Term = diff --git a/tests/run-macros/quote-matching-open/Macro_1.scala b/tests/run-macros/quote-matching-open/Macro_1.scala index 35b860d3bfdd..1295741d805a 100644 --- a/tests/run-macros/quote-matching-open/Macro_1.scala +++ b/tests/run-macros/quote-matching-open/Macro_1.scala @@ -17,29 +17,29 @@ object Macro { object UnsafeExpr { def open[T1, R, X](f: Expr[T1 => R])(content: (Expr[R], [t] => Expr[t] => Expr[T1] => Expr[t]) => X)(using qctx: QuoteContext): X = { - import qctx.reflect._ + import reflect._ val (params, bodyExpr) = paramsAndBody[R](f) content(bodyExpr, [t] => (e: Expr[t]) => (v: Expr[T1]) => bodyFn[t](Term.of(e), params, List(Term.of(v))).asExpr.asInstanceOf[Expr[t]]) } def open[T1, T2, R, X](f: Expr[(T1, T2) => R])(content: (Expr[R], [t] => Expr[t] => (Expr[T1], Expr[T2]) => Expr[t]) => X)(using qctx: QuoteContext)(using DummyImplicit): X = { - import qctx.reflect._ + import reflect._ val (params, bodyExpr) = paramsAndBody[R](f) content(bodyExpr, [t] => (e: Expr[t]) => (v1: Expr[T1], v2: Expr[T2]) => bodyFn[t](Term.of(e), params, List(Term.of(v1), Term.of(v2))).asExpr.asInstanceOf[Expr[t]]) } def open[T1, T2, T3, R, X](f: Expr[(T1, T2, T3) => R])(content: (Expr[R], [t] => Expr[t] => (Expr[T1], Expr[T2], Expr[T3]) => Expr[t]) => X)(using qctx: QuoteContext)(using DummyImplicit, DummyImplicit): X = { - import qctx.reflect._ + import reflect._ val (params, bodyExpr) = paramsAndBody[R](f) content(bodyExpr, [t] => (e: Expr[t]) => (v1: Expr[T1], v2: Expr[T2], v3: Expr[T3]) => bodyFn[t](Term.of(e), params, List(Term.of(v1), Term.of(v2), Term.of(v3))).asExpr.asInstanceOf[Expr[t]]) } private def paramsAndBody[R](using qctx: QuoteContext)(f: Expr[Any]): (List[qctx.reflect.ValDef], Expr[R]) = { - import qctx.reflect._ + import reflect._ val Block(List(DefDef("$anonfun", Nil, List(params), _, Some(body))), Closure(Ident("$anonfun"), None)) = Term.of(f).etaExpand(Symbol.currentOwner) (params, body.asExpr.asInstanceOf[Expr[R]]) } private def bodyFn[t](using qctx: QuoteContext)(e: qctx.reflect.Term, params: List[qctx.reflect.ValDef], args: List[qctx.reflect.Term]): qctx.reflect.Term = { - import qctx.reflect._ + import reflect._ val map = params.map(_.symbol).zip(args).toMap new TreeMap { override def transformTerm(tree: Term)(using ctx: Context): Term = diff --git a/tests/run-macros/quote-toExprOfTuple/Macro_1.scala b/tests/run-macros/quote-toExprOfTuple/Macro_1.scala index 6f82aeb7eba5..f0ec0eee8b90 100644 --- a/tests/run-macros/quote-toExprOfTuple/Macro_1.scala +++ b/tests/run-macros/quote-toExprOfTuple/Macro_1.scala @@ -4,7 +4,7 @@ object Macro { inline def t2[T0, T1](t0: T0, t1: T1): (T0, T1) = ${ impl2('{t0}, '{t1}) } def impl2[T0: Type, T1: Type](t0: Expr[T0], t1: Expr[T1])(using qctx: QuoteContext) : Expr[(T0, T1)] = { - import qctx.reflect._ + import reflect._ import util._ val seq = List(t0, t1) diff --git a/tests/run-macros/quote-type-matcher/quoted_1.scala b/tests/run-macros/quote-type-matcher/quoted_1.scala index 439a28a820a3..7c0e35dfc8c3 100644 --- a/tests/run-macros/quote-type-matcher/quoted_1.scala +++ b/tests/run-macros/quote-type-matcher/quoted_1.scala @@ -5,7 +5,7 @@ object Macros { inline def matches[A, B]: Unit = ${ matchesExpr[A, B] } private def matchesExpr[A, B](using a: Type[A], b: Type[B])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val res = qctx.asInstanceOf[scala.quoted.internal.QuoteMatching].TypeMatch.unapply[Tuple, Tuple](a)(using b).map { tup => tup.toArray.toList.map { diff --git a/tests/run-macros/quoted-matching-docs/Macro_1.scala b/tests/run-macros/quoted-matching-docs/Macro_1.scala index ca2ead0c3b0e..08a501c237ed 100644 --- a/tests/run-macros/quoted-matching-docs/Macro_1.scala +++ b/tests/run-macros/quoted-matching-docs/Macro_1.scala @@ -28,6 +28,6 @@ private def sumExpr(argsExpr: Expr[Seq[Int]])(using qctx: QuoteContext) : Expr[I object UnsafeExpr { def underlyingArgument[T](expr: Expr[T])(using qctx: QuoteContext): Expr[T] = - import qctx.reflect._ + import reflect._ Term.of(expr).underlyingArgument.asExpr.asInstanceOf[Expr[T]] } \ No newline at end of file diff --git a/tests/run-macros/refined-selectable-macro/Macro_1.scala b/tests/run-macros/refined-selectable-macro/Macro_1.scala index 2e8f13181a23..e0700c13ca12 100644 --- a/tests/run-macros/refined-selectable-macro/Macro_1.scala +++ b/tests/run-macros/refined-selectable-macro/Macro_1.scala @@ -15,7 +15,7 @@ object Macro { } private def toTupleImpl(s: Expr[Selectable])(using qctx:QuoteContext) : Expr[Tuple] = { - import qctx.reflect._ + import reflect._ val repr = Term.of(s).tpe.widenTermRefExpr.dealias @@ -49,7 +49,7 @@ object Macro { } private def fromTupleImpl[T: Type](s: Expr[Tuple], newRecord: Expr[Array[(String, Any)] => T])(using qctx:QuoteContext) : Expr[Any] = { - import qctx.reflect._ + import reflect._ val repr = Term.of(s).tpe.widenTermRefExpr.dealias diff --git a/tests/run-macros/reflect-dsl/assert_1.scala b/tests/run-macros/reflect-dsl/assert_1.scala index d3f05dc30cb1..f181723eb1f6 100644 --- a/tests/run-macros/reflect-dsl/assert_1.scala +++ b/tests/run-macros/reflect-dsl/assert_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using qctx: QuoteContext): Expr[Unit] = { - import qctx.reflect._ + import reflect._ import util._ def isImplicitMethodType(tp: TypeRepr): Boolean = tp match diff --git a/tests/run-macros/reflect-lambda/assert_1.scala b/tests/run-macros/reflect-lambda/assert_1.scala index 5425d4b31b0f..5b789926d878 100644 --- a/tests/run-macros/reflect-lambda/assert_1.scala +++ b/tests/run-macros/reflect-lambda/assert_1.scala @@ -5,7 +5,7 @@ object lib { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ import util._ Term.of(cond).underlyingArgument match { diff --git a/tests/run-macros/reflect-pos-fun/assert_1.scala b/tests/run-macros/reflect-pos-fun/assert_1.scala index 8a9806db1831..5b8833c9607c 100644 --- a/tests/run-macros/reflect-pos-fun/assert_1.scala +++ b/tests/run-macros/reflect-pos-fun/assert_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition) } def assertImpl(cond: Expr[Boolean])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ import util._ Term.of(cond).underlyingArgument match { diff --git a/tests/run-macros/reflect-select-constructor/assert_1.scala b/tests/run-macros/reflect-select-constructor/assert_1.scala index 04dd75f6516b..10de4115db3e 100644 --- a/tests/run-macros/reflect-select-constructor/assert_1.scala +++ b/tests/run-macros/reflect-select-constructor/assert_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ import util._ def isImplicitMethodType(tp: TypeRepr): Boolean = tp match diff --git a/tests/run-macros/reflect-select-copy-2/assert_1.scala b/tests/run-macros/reflect-select-copy-2/assert_1.scala index adacd9010c0e..54ddbbdee61e 100644 --- a/tests/run-macros/reflect-select-copy-2/assert_1.scala +++ b/tests/run-macros/reflect-select-copy-2/assert_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ import util._ def isImplicitMethodType(tp: TypeRepr): Boolean = tp match diff --git a/tests/run-macros/reflect-select-copy/assert_1.scala b/tests/run-macros/reflect-select-copy/assert_1.scala index 96071a7283d6..154d7b6689eb 100644 --- a/tests/run-macros/reflect-select-copy/assert_1.scala +++ b/tests/run-macros/reflect-select-copy/assert_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ Term.of(cond).underlyingArgument match { case Apply(select @ Select(lhs, op), rhs :: Nil) => diff --git a/tests/run-macros/reflect-select-symbol-constructor/assert_1.scala b/tests/run-macros/reflect-select-symbol-constructor/assert_1.scala index 112fefdd9427..20f1c2c0850c 100644 --- a/tests/run-macros/reflect-select-symbol-constructor/assert_1.scala +++ b/tests/run-macros/reflect-select-symbol-constructor/assert_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ import util._ def isImplicitMethodType(tp: TypeRepr): Boolean = tp match diff --git a/tests/run-macros/reflect-select-value-class/assert_1.scala b/tests/run-macros/reflect-select-value-class/assert_1.scala index 0865f3e65b37..5949136261d4 100644 --- a/tests/run-macros/reflect-select-value-class/assert_1.scala +++ b/tests/run-macros/reflect-select-value-class/assert_1.scala @@ -5,7 +5,7 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) } def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(using QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ import util._ def isImplicitMethodType(tp: TypeRepr): Boolean = tp match diff --git a/tests/run-macros/requiredSymbols/Macro_1.scala b/tests/run-macros/requiredSymbols/Macro_1.scala index 845c42229b0b..beef44060448 100644 --- a/tests/run-macros/requiredSymbols/Macro_1.scala +++ b/tests/run-macros/requiredSymbols/Macro_1.scala @@ -3,7 +3,7 @@ import scala.quoted._ object Macro { inline def foo: String = ${ fooImpl } def fooImpl(using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ val list = List( Symbol.requiredPackage("java"), Symbol.requiredPackage("java.lang"), diff --git a/tests/run-macros/tasty-argument-tree-1/quoted_1.scala b/tests/run-macros/tasty-argument-tree-1/quoted_1.scala index 1135441552ad..68c99e80830d 100644 --- a/tests/run-macros/tasty-argument-tree-1/quoted_1.scala +++ b/tests/run-macros/tasty-argument-tree-1/quoted_1.scala @@ -5,7 +5,7 @@ object Macros { inline def inspect[T](x: T): Unit = ${ impl('x) } def impl[T](x: Expr[T])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val tree = Term.of(x) '{ println() diff --git a/tests/run-macros/tasty-construct-types/Macro_1.scala b/tests/run-macros/tasty-construct-types/Macro_1.scala index deaafe8ba372..9a40372cb8bf 100644 --- a/tests/run-macros/tasty-construct-types/Macro_1.scala +++ b/tests/run-macros/tasty-construct-types/Macro_1.scala @@ -11,7 +11,7 @@ object Macros { class TestAnnotation extends scala.annotation.Annotation def theTestBlockImpl(using qctx : QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val x1T = ConstantType(Constant.Int(1)) val x2T = OrType(ConstantType(Constant.Int(1)), ConstantType(Constant.Int(2))) diff --git a/tests/run-macros/tasty-create-method-symbol/Macro_1.scala b/tests/run-macros/tasty-create-method-symbol/Macro_1.scala index 00fe681403cb..cc5d3a4e58b3 100644 --- a/tests/run-macros/tasty-create-method-symbol/Macro_1.scala +++ b/tests/run-macros/tasty-create-method-symbol/Macro_1.scala @@ -5,7 +5,7 @@ object Macros { inline def theTestBlock : Unit = ${ theTestBlockImpl } def theTestBlockImpl(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ // simple smoke test val sym1 : Symbol = Symbol.newMethod( diff --git a/tests/run-macros/tasty-dealias/quoted_1.scala b/tests/run-macros/tasty-dealias/quoted_1.scala index b57137d439e4..1c119f7bfa2c 100644 --- a/tests/run-macros/tasty-dealias/quoted_1.scala +++ b/tests/run-macros/tasty-dealias/quoted_1.scala @@ -5,7 +5,7 @@ object Macros { inline def dealias[T]: String = ${ impl[T] } def impl[T: Type](using qctx: QuoteContext) : Expr[String] = { - import qctx.reflect._ + import reflect._ Expr(TypeRepr.of[T].dealias.show) } } diff --git a/tests/run-macros/tasty-definitions-1/quoted_1.scala b/tests/run-macros/tasty-definitions-1/quoted_1.scala index 059aa45e4d66..bd6c96979ec6 100644 --- a/tests/run-macros/tasty-definitions-1/quoted_1.scala +++ b/tests/run-macros/tasty-definitions-1/quoted_1.scala @@ -5,7 +5,7 @@ object Macros { inline def testDefinitions(): Unit = ${testDefinitionsImpl} def testDefinitionsImpl(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val buff = List.newBuilder[String] def printout(x: => String): Unit = { diff --git a/tests/run-macros/tasty-eval/quoted_1.scala b/tests/run-macros/tasty-eval/quoted_1.scala index 0228042a4ce8..819020d7d912 100644 --- a/tests/run-macros/tasty-eval/quoted_1.scala +++ b/tests/run-macros/tasty-eval/quoted_1.scala @@ -17,7 +17,7 @@ object Macros { implicit def intIsEvalable: Valuable[Int] = new Valuable[Int] { override def value(e: Expr[Int])(using qctx: QuoteContext) : Option[Int] = { - import qctx.reflect._ + import reflect._ Term.of(e).tpe match { case pre: TermRef if pre.termSymbol.isValDef => diff --git a/tests/run-macros/tasty-extractors-1/quoted_1.scala b/tests/run-macros/tasty-extractors-1/quoted_1.scala index 10dde3d73572..9ef613ff9ae0 100644 --- a/tests/run-macros/tasty-extractors-1/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-1/quoted_1.scala @@ -6,7 +6,7 @@ object Macros { ${ impl('x) } def impl[T](x: Expr[T])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val tree = Term.of(x) val treeStr = Expr(tree.showExtractors) diff --git a/tests/run-macros/tasty-extractors-2/quoted_1.scala b/tests/run-macros/tasty-extractors-2/quoted_1.scala index 325e5c13e4e9..c903e067c4e4 100644 --- a/tests/run-macros/tasty-extractors-2/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-2/quoted_1.scala @@ -6,7 +6,7 @@ object Macros { ${ impl('x) } def impl[T](x: Expr[T])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val tree = Term.of(x) diff --git a/tests/run-macros/tasty-extractors-3/quoted_1.scala b/tests/run-macros/tasty-extractors-3/quoted_1.scala index b7d442067e23..4edba48e7e71 100644 --- a/tests/run-macros/tasty-extractors-3/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-3/quoted_1.scala @@ -7,7 +7,7 @@ object Macros { ${impl('x)} def impl[T](x: Expr[T])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val buff = new StringBuilder val traverser = new TreeTraverser { diff --git a/tests/run-macros/tasty-extractors-types/quoted_1.scala b/tests/run-macros/tasty-extractors-types/quoted_1.scala index eba636d98416..bbef0c2ef627 100644 --- a/tests/run-macros/tasty-extractors-types/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-types/quoted_1.scala @@ -5,7 +5,7 @@ object Macros { implicit inline def printType[T]: Unit = ${ impl[T] } def impl[T: Type](using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ '{ println(${Expr(TypeTree.of[T].showExtractors)}) println(${Expr(TypeRepr.of[T].showExtractors)}) diff --git a/tests/run-macros/tasty-getfile-implicit-by-name-fun-context/Macro_1.scala b/tests/run-macros/tasty-getfile-implicit-by-name-fun-context/Macro_1.scala index 3db59d7d0f97..cddc71a1316b 100644 --- a/tests/run-macros/tasty-getfile-implicit-by-name-fun-context/Macro_1.scala +++ b/tests/run-macros/tasty-getfile-implicit-by-name-fun-context/Macro_1.scala @@ -8,6 +8,6 @@ object SourceFiles { ${getThisFileImpl} def getThisFileImpl: Macro[String] = - Expr(qctx.reflect.Source.path.getFileName.toString) + Expr(reflect.Source.path.getFileName.toString) } diff --git a/tests/run-macros/tasty-indexed-map/quoted_1.scala b/tests/run-macros/tasty-indexed-map/quoted_1.scala index af49b7fc10ff..c37ed9a9d78d 100644 --- a/tests/run-macros/tasty-indexed-map/quoted_1.scala +++ b/tests/run-macros/tasty-indexed-map/quoted_1.scala @@ -25,7 +25,7 @@ object Index { implicit inline def succ[K, H, T](implicit prev: => Index[K, T]): Index[K, (H, T)] = ${succImpl[K, H, T]} def succImpl[K, H, T](implicit qctx: QuoteContext, k: Type[K], h: Type[H], t: Type[T]): Expr[Index[K, (H, T)]] = { - import qctx.reflect._ + import reflect._ def name(tp: TypeRepr): String = tp match { case ConstantType(Constant.String(str)) => str diff --git a/tests/run-macros/tasty-interpolation-1/Macro.scala b/tests/run-macros/tasty-interpolation-1/Macro.scala index 56f5f8c2f9d2..790bc502ae86 100644 --- a/tests/run-macros/tasty-interpolation-1/Macro.scala +++ b/tests/run-macros/tasty-interpolation-1/Macro.scala @@ -55,7 +55,7 @@ abstract class MacroStringInterpolator[T] { protected def interpolate(strCtx: StringContext, argExprs: List[Expr[Any]]) (using QuoteContext): Expr[T] protected def getStaticStringContext(strCtxExpr: Expr[StringContext])(using qctx: QuoteContext) : StringContext = { - import qctx.reflect._ + import reflect._ Term.of(strCtxExpr).underlyingArgument match { case Select(Typed(Apply(_, List(Apply(_, List(Typed(Repeated(strCtxArgTrees, _), Inferred()))))), _), _) => val strCtxArgs = strCtxArgTrees.map { @@ -69,7 +69,7 @@ abstract class MacroStringInterpolator[T] { } protected def getArgsList(argsExpr: Expr[Seq[Any]])(using qctx: QuoteContext) : List[Expr[Any]] = { - import qctx.reflect._ + import reflect._ Term.of(argsExpr).underlyingArgument match { case Typed(Repeated(args, _), _) => args.map(_.asExpr) case tree => throw new NotStaticlyKnownError("Expected statically known argument list", tree.asExpr) diff --git a/tests/run-macros/tasty-linenumber-2/quoted_1.scala b/tests/run-macros/tasty-linenumber-2/quoted_1.scala index e2cd171d6a16..e753cf593448 100644 --- a/tests/run-macros/tasty-linenumber-2/quoted_1.scala +++ b/tests/run-macros/tasty-linenumber-2/quoted_1.scala @@ -9,7 +9,7 @@ object LineNumber { implicit inline def line: LineNumber = ${lineImpl} def lineImpl(using QuoteContext) : Expr[LineNumber] = { - import qctx.reflect._ + import reflect._ '{new LineNumber(${Expr(Position.ofMacroExpansion.startLine)})} } diff --git a/tests/run-macros/tasty-linenumber/quoted_1.scala b/tests/run-macros/tasty-linenumber/quoted_1.scala index 4cb719de3a16..f7dfa8362c69 100644 --- a/tests/run-macros/tasty-linenumber/quoted_1.scala +++ b/tests/run-macros/tasty-linenumber/quoted_1.scala @@ -10,7 +10,7 @@ object LineNumber { ${lineImpl(Type.of[T])} def lineImpl(x: Type[Unit])(using QuoteContext) : Expr[LineNumber] = { - import qctx.reflect._ + import reflect._ '{new LineNumber(${Expr(Position.ofMacroExpansion.startLine)})} } diff --git a/tests/run-macros/tasty-location/quoted_1.scala b/tests/run-macros/tasty-location/quoted_1.scala index d677bac223ab..8673154ac4e5 100644 --- a/tests/run-macros/tasty-location/quoted_1.scala +++ b/tests/run-macros/tasty-location/quoted_1.scala @@ -7,7 +7,7 @@ object Location { implicit inline def location: Location = ${impl} def impl(using qctx: QuoteContext) : Expr[Location] = { - import qctx.reflect._ + import reflect._ def listOwnerNames(sym: Symbol, acc: List[String]): List[String] = if (sym == defn.RootClass || sym == defn.EmptyPackageClass) acc diff --git a/tests/run-macros/tasty-macro-assert/quoted_1.scala b/tests/run-macros/tasty-macro-assert/quoted_1.scala index a59e1bb9da5f..f2d99129da2b 100644 --- a/tests/run-macros/tasty-macro-assert/quoted_1.scala +++ b/tests/run-macros/tasty-macro-assert/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 = Term.of(cond) diff --git a/tests/run-macros/tasty-macro-const/quoted_1.scala b/tests/run-macros/tasty-macro-const/quoted_1.scala index 5be05dac141e..743b91a408c6 100644 --- a/tests/run-macros/tasty-macro-const/quoted_1.scala +++ b/tests/run-macros/tasty-macro-const/quoted_1.scala @@ -5,7 +5,7 @@ object Macros { inline def natConst(x: Int): Int = ${ natConstImpl('x) } def natConstImpl(x: Expr[Int])(using qctx: QuoteContext) : Expr[Int] = { - import qctx.reflect._ + import reflect._ val xTree: Term = Term.of(x) xTree match { case Inlined(_, _, Literal(Constant.Int(n))) => diff --git a/tests/run-macros/tasty-macro-positions/quoted_1.scala b/tests/run-macros/tasty-macro-positions/quoted_1.scala index 7fe22585c2a4..3e20501b2de5 100644 --- a/tests/run-macros/tasty-macro-positions/quoted_1.scala +++ b/tests/run-macros/tasty-macro-positions/quoted_1.scala @@ -9,7 +9,7 @@ object Macros { inline def fun3[T]: Unit = ${ impl2(using Type.of[T]) } def impl(x: Expr[Any])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val pos = Term.of(x).underlyingArgument.pos val code = Term.of(x).underlyingArgument.show '{ @@ -19,7 +19,7 @@ object Macros { } def impl2[T](using x: Type[T])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val pos = TypeTree.of[T].pos val code = TypeTree.of[T].show '{ @@ -30,7 +30,7 @@ object Macros { def posStr(qctx: QuoteContext)(pos: qctx.reflect.Position): Expr[String] = { given QuoteContext = qctx - import qctx.reflect._ + import reflect._ Expr(s"${pos.sourceFile.jpath.getFileName.toString}:[${pos.start}..${pos.end}]") } } diff --git a/tests/run-macros/tasty-original-source/Macros_1.scala b/tests/run-macros/tasty-original-source/Macros_1.scala index cc0d9a44f5b5..479dfcefa8c1 100644 --- a/tests/run-macros/tasty-original-source/Macros_1.scala +++ b/tests/run-macros/tasty-original-source/Macros_1.scala @@ -5,7 +5,7 @@ object Macros { implicit inline def withSource(arg: Any): (String, Any) = ${ impl('arg) } private def impl(arg: Expr[Any])(using qctx: QuoteContext) : Expr[(String, Any)] = { - import qctx.reflect._ + import reflect._ val source = Expr(Term.of(arg).underlyingArgument.pos.sourceCode.toString) '{Tuple2($source, $arg)} } diff --git a/tests/run-macros/tasty-overload-secondargs/Macro_1.scala b/tests/run-macros/tasty-overload-secondargs/Macro_1.scala index f8905eec6630..cfef941f64fb 100644 --- a/tests/run-macros/tasty-overload-secondargs/Macro_1.scala +++ b/tests/run-macros/tasty-overload-secondargs/Macro_1.scala @@ -22,7 +22,7 @@ object Macro: } def mThenImpl[A:Type, B:Type, S<:(A=>B) :Type, R:Type](x:Expr[S])(using qctx: QuoteContext):Expr[R]= - import qctx.reflect._ + import reflect._ val fun = Term.of('{X}) val returnType = TypeRepr.of[(S) => ?] val firstPart = Select.overloaded(fun,"andThen", diff --git a/tests/run-macros/tasty-seal-method/quoted_1.scala b/tests/run-macros/tasty-seal-method/quoted_1.scala index 078a47dc6628..07192525bcd7 100644 --- a/tests/run-macros/tasty-seal-method/quoted_1.scala +++ b/tests/run-macros/tasty-seal-method/quoted_1.scala @@ -7,7 +7,7 @@ object Asserts { /** Replaces last argument list by 0s */ def zeroLastArgsImpl(x: Expr[Int])(using qctx: QuoteContext) : Expr[Int] = { - import qctx.reflect._ + import reflect._ // For simplicity assumes that all parameters are Int and parameter lists have no more than 3 elements Term.of(x).underlyingArgument match { case Apply(fn, args) => @@ -29,7 +29,7 @@ object Asserts { /** Replaces all argument list by 0s */ def zeroAllArgsImpl(x: Expr[Int])(using qctx: QuoteContext) : Expr[Int] = { - import qctx.reflect._ + import reflect._ // For simplicity assumes that all parameters are Int and parameter lists have no more than 3 elements def rec(term: Term): Term = term match { case Apply(fn, args) => diff --git a/tests/run-macros/tasty-simplified/quoted_1.scala b/tests/run-macros/tasty-simplified/quoted_1.scala index da33cc8612fc..df1395dc9662 100644 --- a/tests/run-macros/tasty-simplified/quoted_1.scala +++ b/tests/run-macros/tasty-simplified/quoted_1.scala @@ -6,7 +6,7 @@ object Macros { inline def simplified[T <: Tuple]: Seq[String] = ${ impl[T] } def impl[T: Type](using qctx: QuoteContext) : Expr[Seq[String]] = { - import qctx.reflect._ + import reflect._ def unpackTuple(tp: TypeRepr): List[TypeRepr] = { @tailrec diff --git a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala index f05a656d1533..ae51685edd0c 100644 --- a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala +++ b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala @@ -23,7 +23,7 @@ object Macro { case ('{ StringContext(${Varargs(parts)}: _*) }, Varargs(args)) => val reporter = new Reporter { def errorOnPart(msg: String, partIdx: Int): Unit = { - import qctx.reflect._ + import reflect._ Reporting.error(msg, Term.of(parts(partIdx)).pos) } } @@ -37,7 +37,7 @@ object Macro { val errors = List.newBuilder[Expr[(Int, Int, Int, String)]] val reporter = new Reporter { def errorOnPart(msg: String, partIdx: Int): Unit = { - import qctx.reflect._ + import reflect._ val pos = Term.of(parts(partIdx)).pos errors += '{ Tuple4(${Expr(partIdx)}, ${Expr(pos.start)}, ${Expr(pos.end)}, ${Expr(msg)}) } } diff --git a/tests/run-macros/tasty-subtyping/quoted_1.scala b/tests/run-macros/tasty-subtyping/quoted_1.scala index bfbb9fd74892..2414e2651c6c 100644 --- a/tests/run-macros/tasty-subtyping/quoted_1.scala +++ b/tests/run-macros/tasty-subtyping/quoted_1.scala @@ -9,13 +9,13 @@ object Macros { ${isSubTypeOfImpl[T, U]} def isTypeEqualImpl[T: Type, U: Type](using QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ val isTypeEqual = TypeRepr.of[T] =:= TypeRepr.of[U] Expr(isTypeEqual) } def isSubTypeOfImpl[T: Type, U: Type](using QuoteContext) : Expr[Boolean] = { - import qctx.reflect._ + import reflect._ val isTypeEqual = TypeRepr.of[T] <:< TypeRepr.of[U] Expr(isTypeEqual) } diff --git a/tests/run-macros/tasty-tree-map/quoted_1.scala b/tests/run-macros/tasty-tree-map/quoted_1.scala index d3b28ae562b6..066e89867040 100644 --- a/tests/run-macros/tasty-tree-map/quoted_1.scala +++ b/tests/run-macros/tasty-tree-map/quoted_1.scala @@ -5,7 +5,7 @@ object Macros: object MacrosImpl: def impl[T: Type](x: Expr[T])(using qctx: QuoteContext) : Expr[T] = { - import qctx.reflect._ + import reflect._ val identityMap = new TreeMap { } val transformed = identityMap.transformTerm(Term.of(x)).asExprOf[T] transformed diff --git a/tests/run-macros/tasty-typeof/Macro_1.scala b/tests/run-macros/tasty-typeof/Macro_1.scala index 036cf3f6e65c..6e68d3ed8ccb 100644 --- a/tests/run-macros/tasty-typeof/Macro_1.scala +++ b/tests/run-macros/tasty-typeof/Macro_1.scala @@ -5,7 +5,7 @@ object Macros { inline def testTypeOf(): Unit = ${ testTypeOfImpl } private def testTypeOfImpl(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ '{ assert(${Expr(TypeRepr.of[Unit] =:= TypeRepr.of[Unit])}, "Unit") assert(${Expr(TypeRepr.of[Byte] =:= TypeRepr.of[Byte])}, "Byte") diff --git a/tests/run-macros/tasty-unsafe-let/quoted_1.scala b/tests/run-macros/tasty-unsafe-let/quoted_1.scala index da29c8b5d172..8d5f4b96169b 100644 --- a/tests/run-macros/tasty-unsafe-let/quoted_1.scala +++ b/tests/run-macros/tasty-unsafe-let/quoted_1.scala @@ -6,11 +6,11 @@ object Macros { ${ impl('rhs, 'body) } private def impl[T: Type](rhs: Expr[T], body: Expr[T => Unit])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.reflect._ + import reflect._ val rhsTerm = Term.of(rhs) - import qctx.reflect._ + import reflect._ ValDef.let(Symbol.spliceOwner, rhsTerm) { rhsId => Term.of(Expr.betaReduce('{$body(${rhsId.asExpr.asInstanceOf[Expr[T]]})})) // Dangerous uncheked cast! }.asExprOf[Unit] diff --git a/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala index bfa24ab3b7f5..9ef446d14033 100644 --- a/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala +++ b/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala @@ -13,7 +13,7 @@ object XmlQuote { def impl(receiver: Expr[SCOps], args: Expr[Seq[Any]]) (using qctx: QuoteContext) : Expr[Xml] = { - import qctx.reflect._ + import reflect._ // for debugging purpose def pp(tree: Tree): Unit = { diff --git a/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala index cf9d3c6866e3..ab5a157abc56 100644 --- a/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala +++ b/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala @@ -14,7 +14,7 @@ object XmlQuote { implicit inline def SCOps(ctx: => StringContext): SCOps = new SCOps(ctx) def impl(receiver: Expr[SCOps], args: Expr[Seq[Any]])(using qctx: QuoteContext) : Expr[Xml] = { - import qctx.reflect._ + import reflect._ // for debugging purpose def pp(tree: Tree): Unit = { diff --git a/tests/run-staging/liftables.scala b/tests/run-staging/liftables.scala index 80ffff7b3fcf..c1610bfaf5a8 100644 --- a/tests/run-staging/liftables.scala +++ b/tests/run-staging/liftables.scala @@ -17,7 +17,7 @@ object Test { println(Expr("string").show) println() println(Expr(classOf[String]).show) - println(Expr(summon[reflect.ClassTag[String]]).show) + println(Expr(summon[scala.reflect.ClassTag[String]]).show) println() println(Expr(Array("a")).show) println(Expr(Array(true)).show)