Merge pull request #8191 from dotty-staging/add-missing-contexts

Add missing contexts and remove unnecessary given arguments

Author: nicolasstucki

library/src/scala/quoted/QuoteContext.scala

@@ -25,13 +25,13 @@ class QuoteContext(val tasty: scala.tasty.Reflection) {
   /** Report an error at the position of the macro expansion */
   def error(msg: => String): Unit = {
     import tasty.{_, given}
-    tasty.error(msg, rootPosition)(given rootContext)
+    tasty.error(msg, rootPosition)
   }
 
   /** Report an error at the on the position of `expr` */
-  def error(msg: => String, expr: Expr[_]): Unit = {
+  def error(msg: => String, expr: Expr[Any]): Unit = {
     import tasty.{_, given}
-    tasty.error(msg, expr.unseal.pos)(given rootContext)
+    tasty.error(msg, expr.unseal.pos)
   }
 
   /** Report an error at the position of the macro expansion and throws a StopQuotedContext */
@@ -40,21 +40,21 @@ class QuoteContext(val tasty: scala.tasty.Reflection) {
     throw new StopQuotedContext
   }
   /** Report an error at the on the position of `expr` and throws a StopQuotedContext */
-  def throwError(msg: => String, expr: Expr[_]): Nothing = {
+  def throwError(msg: => String, expr: Expr[Any]): Nothing = {
     error(msg, expr)
     throw new StopQuotedContext
   }
 
   /** Report a warning */
   def warning(msg: => String): Unit = {
     import tasty.{_, given}
-    tasty.warning(msg, rootPosition)(given rootContext)
+    tasty.warning(msg, rootPosition)
   }
 
   /** Report a warning at the on the position of `expr` */
   def warning(msg: => String, expr: Expr[_]): Unit = {
     import tasty.{_, given}
-    tasty.warning(msg, expr.unseal.pos)(given rootContext)
+    tasty.warning(msg, expr.unseal.pos)
   }
 
 }

library/src/scala/tasty/Reflection.scala

@@ -1593,7 +1593,7 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
   ///////////////
 
   /** Returns the type (Type) of T */
-  def typeOf[T](given qtype: scala.quoted.Type[T]): Type = qtype.unseal.tpe
+  def typeOf[T](given qtype: scala.quoted.Type[T], ctx: Context): Type = qtype.unseal.tpe
 
   /** Members of `TypeOrBounds` */
   extension TypeOrBoundsOps on (tpe: TypeOrBounds) {
@@ -2990,7 +2990,7 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
   }
 
   /** Bind the `rhs` to a `val` and use it in `body` */
-  def let(rhs: Term)(body: Ident => Term): Term = {
+  def let(rhs: Term)(body: Ident => Term)(given ctx: Context): Term = {
     import scala.quoted.QuoteContext
     given QuoteContext = new QuoteContext(this)
     val expr = (rhs.seal: @unchecked) match {
@@ -3007,7 +3007,7 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
   }
 
   /** Bind the given `terms` to names and use them in the `body` */
-  def lets(terms: List[Term])(body: List[Term] => Term): Term = {
+  def lets(terms: List[Term])(body: List[Term] => Term)(given Context): Term = {
     def rec(xs: List[Term], acc: List[Term]): Term = xs match {
       case Nil => body(acc)
       case x :: xs => let(x) { (x: Term) => rec(xs, x :: acc) }