Merge pull request #6785 from dotty-staging/add-QuoteContext-to-Liftable

Add missing QuoteContext to Liftable.toExpr

Author: nicolasstucki

community-build/community-projects/scalatest

@@ -251,8 +251,9 @@ The `toExpr` extension method is defined in package `quoted`:
 ```scala
     package quoted
 
-    delegate LiftingOps {
-      def (x: T) toExpr[T] given (ev: Liftable[T]): Expr[T] = ev.toExpr(x)
+    delegate ExprOps {
+      def (x: T) toExpr[T: Liftable] given QuoteContext: Expr[T] = the[Liftable[T]].toExpr(x)
+      ...
     }
 ```
 The extension says that values of types implementing the `Liftable` type class can be
@@ -269,15 +270,16 @@ knowing anything about the representation of `Expr` trees. For
 instance, here is a possible instance of `Liftable[Boolean]`:
 ```scala
     delegate for Liftable[Boolean] {
-      def toExpr(b: Boolean) = if (b) '{ true } else '{ false }
+      def toExpr(b: Boolean) given QuoteContext: Expr[Boolean] =
+        if (b) '{ true } else '{ false }
     }
 ```
 Once we can lift bits, we can work our way up. For instance, here is a
 possible implementation of `Liftable[Int]` that does not use the underlying
 tree machinery:
 ```scala
     delegate for Liftable[Int] {
-      def toExpr(n: Int): Expr[Int] = n match {
+      def toExpr(n: Int) given QuoteContext: Expr[Int] = n match {
         case Int.MinValue    => '{ Int.MinValue }
         case _ if n < 0      => '{ - ${ toExpr(-n) } }
         case 0               => '{ 0 }
@@ -290,7 +292,7 @@ Since `Liftable` is a type class, its instances can be conditional. For example,
 a `List` is liftable if its element type is:
 ```scala
     delegate [T: Liftable] for Liftable[List[T]] {
-      def toExpr(xs: List[T]): Expr[List[T]] = xs match {
+      def toExpr(xs: List[T]) given QuoteContext: Expr[List[T]] = xs match {
         case head :: tail => '{ ${ toExpr(head) } :: ${ toExpr(tail) } }
         case Nil => '{ Nil: List[T] }
       }

community-build/community-projects/xml-interpolator

@@ -25,7 +25,6 @@ is used.
 
 ```scala
 import scala.quoted._
-import scala.tasty._
 
 inline def natConst(x: => Int): Int = ${natConstImpl('{x})}
 

docs/docs/reference/metaprogramming/macros.md

@@ -6,7 +6,7 @@ import scala.runtime.quoted.Unpickler.liftedExpr
  *  without going through an explicit `'{...}` operation.
  */
 abstract class Liftable[T] {
-  def toExpr(x: T): Expr[T]
+  def toExpr(x: T) given QuoteContext: Expr[T]
 }
 
 /** Some liftable base types. To be completed with at least all types
@@ -27,7 +27,7 @@ object Liftable {
   implicit def ClassIsLiftable[T]: Liftable[Class[T]] = new PrimitiveLiftable
 
   private class PrimitiveLiftable[T] extends Liftable[T] {
-    override def toExpr(x: T): Expr[T] = liftedExpr(x)
+    override def toExpr(x: T) given QuoteContext: Expr[T] = liftedExpr(x)
   }
 
 }

docs/docs/reference/metaprogramming/tasty-reflect.md

@@ -48,11 +48,11 @@ package object quoted {
   private object NoResult
 
   object autolift {
-    implicit def autoToExpr[T: Liftable](x: T): Expr[T] = x.toExpr
+    implicit def autoToExpr[T: Liftable](x: T) given QuoteContext: Expr[T] = x.toExpr
   }
 
   implicit object ExprOps {
-    def (x: T) toExpr[T] given Liftable[T]: Expr[T] = the[Liftable[T]].toExpr(x)
+    def (x: T) toExpr[T: Liftable] given QuoteContext: Expr[T] = the[Liftable[T]].toExpr(x)
 
     def (list: List[Expr[T]]) toExprOfList[T] given Type[T]: Expr[List[T]] = list match {
       case x :: xs  => '{ $x :: ${xs.toExprOfList} }

library/src-3.x/scala/quoted/Liftable.scala

@@ -4,7 +4,6 @@ package dotty.internal
 
 import scala.quoted._
 import scala.quoted.matching._
-import scala.tasty.Reflection
 import reflect._
 
 object StringContextMacro {

library/src-3.x/scala/quoted/package.scala

@@ -1,6 +1,5 @@
 package dotty.semanticdb
 
-import scala.tasty.Reflection
 import scala.tasty.file._
 import scala.NotImplementedError
 

library/src-non-bootstrapped/dotty/internal/StringContextMacro.scala

@@ -1,7 +1,5 @@
 package dotty.semanticdb
 
-import scala.tasty.Reflection
-
 import scala.meta.internal.{semanticdb => s}
 import scala.tasty.Reflection
 import scala.tasty.file.TastyConsumer

semanticdb/src/dotty/semanticdb/Main.scala

@@ -1,7 +1,6 @@
 package dotty.semanticdb
 
 
-import scala.tasty.Reflection
 import scala.tasty.file._
 import scala.collection.mutable.HashMap
 
@@ -11,7 +10,6 @@ import java.nio.file._
 import scala.meta.internal.{semanticdb => s}
 import scala.collection.JavaConverters._
 import java.io.File
-import scala.tasty.Reflection
 import scala.tasty.file.TastyConsumer
 import java.lang.reflect.InvocationTargetException