Try to rename QuoteContext to Quotes

This change is aimed to have shorter signatures.

```diff
- def foo[T: Type](x: Expr[T])(using QuoteContext) = ...
+ def foo[T: Type](x: Expr[T])(using Quotes) = ...
```

It also seem to read better, "using quotes" which is exaclty what this contextual parameters indicates.

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -794,7 +794,7 @@ class Definitions {
   @tu lazy val QuotedExprClass: ClassSymbol = requiredClass("scala.quoted.Expr")
   @tu lazy val QuotedExprModule: Symbol = QuotedExprClass.companionModule
 
-  @tu lazy val QuoteContextClass: ClassSymbol = requiredClass("scala.quoted.QuoteContext")
+  @tu lazy val QuotesClass: ClassSymbol = requiredClass("scala.quoted.Quotes")
 
   @tu lazy val QuoteUnpicklerClass: ClassSymbol = requiredClass("scala.quoted.internal.QuoteUnpickler")
     @tu lazy val QuoteUnpickler_unpickleExpr: Symbol = QuoteUnpicklerClass.requiredMethod("unpickleExpr")

compiler/src/dotty/tools/dotc/core/StagingContext.scala

@@ -17,9 +17,9 @@ object StagingContext {
   private val QuotationLevel = new Property.Key[Int]
 
   /** A key to be used in a context property that tracks the quoteation stack.
-   *  Stack containing the QuoteContext references recieved by the surrounding quotes.
+   *  Stack containing the Quotes references recieved by the surrounding quotes.
    */
-  private val QuoteContextStack = new Property.Key[List[tpd.Tree]]
+  private val QuotesStack = new Property.Key[List[tpd.Tree]]
 
   private val TaggedTypes = new Property.Key[PCPCheckAndHeal.QuoteTypeTags]
 
@@ -31,11 +31,11 @@ object StagingContext {
   def quoteContext(using Context): Context =
     ctx.fresh.setProperty(QuotationLevel, level + 1)
 
-  /** Context with an incremented quotation level and pushes a refecence to a QuoteContext on the quote context stack */
-  def pushQuoteContext(qctxRef: tpd.Tree)(using Context): Context =
-    val old = ctx.property(QuoteContextStack).getOrElse(List.empty)
+  /** Context with an incremented quotation level and pushes a refecence to a Quotes on the quote context stack */
+  def pushQuotes(qctxRef: tpd.Tree)(using Context): Context =
+    val old = ctx.property(QuotesStack).getOrElse(List.empty)
     ctx.fresh.setProperty(QuotationLevel, level + 1)
-             .setProperty(QuoteContextStack, qctxRef :: old)
+             .setProperty(QuotesStack, qctxRef :: old)
 
   /** Context with a decremented quotation level. */
   def spliceContext(using Context): Context =
@@ -50,12 +50,12 @@ object StagingContext {
   /** Context with a decremented quotation level and pops the Some of top of the quote context stack or None if the stack is empty.
    *  The quotation stack could be empty if we are in a top level splice or an eroneous splice directly witin a top level splice.
    */
-  def popQuoteContext()(using Context): (Option[tpd.Tree], Context) =
+  def popQuotes()(using Context): (Option[tpd.Tree], Context) =
     val ctx1 = ctx.fresh.setProperty(QuotationLevel, level - 1)
     val head =
-      ctx.property(QuoteContextStack) match
+      ctx.property(QuotesStack) match
         case Some(x :: xs) =>
-          ctx1.setProperty(QuoteContextStack, xs)
+          ctx1.setProperty(QuotesStack, xs)
           Some(x)
         case _ =>
           None // Splice at level 0 or lower

compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala

@@ -9,7 +9,7 @@ import scala.io.Codec
 import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.tasty.TastyPrinter
-import dotty.tools.dotc.quoted.QuoteContextImpl
+import dotty.tools.dotc.quoted.QuotesImpl
 import dotty.tools.io.File
 
 /** Phase that prints the trees in all loaded compilation units.
@@ -44,7 +44,7 @@ class DecompilationPrinter extends Phase {
     else {
       val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
       out.println(s"/** Decompiled from $unitFile */")
-      out.println(QuoteContextImpl.showDecompiledTree(unit.tpdTree))
+      out.println(QuotesImpl.showDecompiledTree(unit.tpdTree))
     }
   }
 }

compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala

@@ -6,7 +6,7 @@ import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core._
 import dotty.tools.dotc.core.tasty.TastyHTMLPrinter
 import dotty.tools.dotc.reporting._
-import dotty.tools.dotc.quoted.QuoteContextImpl
+import dotty.tools.dotc.quoted.QuotesImpl
 
 /**
   * Decompiler to be used with IDEs
@@ -34,7 +34,7 @@ class IDEDecompilerDriver(val settings: List[String]) extends dotc.Driver {
       run.printSummary()
       val unit = ctx.run.units.head
 
-      val decompiled = QuoteContextImpl.showDecompiledTree(unit.tpdTree)
+      val decompiled = QuotesImpl.showDecompiledTree(unit.tpdTree)
       val tree = new TastyHTMLPrinter(unit.pickled.head._2()).showContents()
 
       reporter.removeBufferedMessages.foreach(message => System.err.println(message))

compiler/src/dotty/tools/dotc/quoted/Matcher.scala

@@ -97,7 +97,7 @@ import scala.quoted._
  */
 object Matcher {
 
-  abstract class QuoteMatcher[QCtx <: QuoteContext & Singleton](val qctx: QCtx) {
+  abstract class QuoteMatcher[QCtx <: Quotes & Singleton](val qctx: QCtx) {
 
     // TODO improve performance
 

compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala

@@ -19,7 +19,7 @@ import dotty.tools.dotc.report
 
 import scala.reflect.ClassTag
 
-import scala.quoted.QuoteContext
+import scala.quoted.Quotes
 import scala.collection.mutable
 
 import QuoteUtils._
@@ -39,19 +39,19 @@ object PickledQuotes {
   /** Transform the expression into its fully spliced Tree */
   def quotedExprToTree[T](expr: quoted.Expr[T])(using Context): Tree = {
     val expr1 = expr.asInstanceOf[dotty.tools.dotc.quoted.ExprImpl]
-    expr1.checkScopeId(QuoteContextImpl.scopeId)
+    expr1.checkScopeId(QuotesImpl.scopeId)
     changeOwnerOfTree(expr1.tree, ctx.owner)
   }
 
   /** Transform the expression into its fully spliced TypeTree */
   def quotedTypeToTree(tpe: quoted.Type[?])(using Context): Tree = {
     val tpe1 = tpe.asInstanceOf[dotty.tools.dotc.quoted.TypeImpl]
-    tpe1.checkScopeId(QuoteContextImpl.scopeId)
+    tpe1.checkScopeId(QuotesImpl.scopeId)
     changeOwnerOfTree(tpe1.typeTree, ctx.owner)
   }
 
   /** Unpickle the tree contained in the TastyExpr */
-  def unpickleTerm(pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?])(using Context): Tree = {
+  def unpickleTerm(pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.Quotes) => scala.quoted.Expr[?])(using Context): Tree = {
     val unpickled = withMode(Mode.ReadPositions)(unpickle(pickled, isType = false))
     val Inlined(call, Nil, expnasion) = unpickled
     val inlineCtx = inlineContext(call)
@@ -61,22 +61,22 @@ object PickledQuotes {
   }
 
   /** Unpickle the tree contained in the TastyType */
-  def unpickleTypeTree(pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?])(using Context): Tree = {
+  def unpickleTypeTree(pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.Quotes) => scala.quoted.Expr[?])(using Context): Tree = {
     val unpickled = withMode(Mode.ReadPositions)(unpickle(pickled, isType = true))
     spliceTypes(unpickled, typeHole, termHole)
   }
 
   /** Replace all term holes with the spliced terms */
-  private def spliceTerms(tree: Tree, typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?])(using Context): Tree = {
+  private def spliceTerms(tree: Tree, typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.Quotes) => scala.quoted.Expr[?])(using Context): Tree = {
     val evaluateHoles = new TreeMap {
       override def transform(tree: tpd.Tree)(using Context): tpd.Tree = tree match {
         case Hole(isTerm, idx, args) =>
           val reifiedArgs = args.map { arg =>
-            if (arg.isTerm) (using qctx: QuoteContext) => new dotty.tools.dotc.quoted.ExprImpl(arg, QuoteContextImpl.scopeId)
-            else new dotty.tools.dotc.quoted.TypeImpl(arg, QuoteContextImpl.scopeId)
+            if (arg.isTerm) (using qctx: Quotes) => new dotty.tools.dotc.quoted.ExprImpl(arg, QuotesImpl.scopeId)
+            else new dotty.tools.dotc.quoted.TypeImpl(arg, QuotesImpl.scopeId)
           }
           if isTerm then
-            val quotedExpr = termHole(idx, reifiedArgs, dotty.tools.dotc.quoted.QuoteContextImpl())
+            val quotedExpr = termHole(idx, reifiedArgs, dotty.tools.dotc.quoted.QuotesImpl())
             val filled = PickledQuotes.quotedExprToTree(quotedExpr)
 
             // We need to make sure a hole is created with the source file of the surrounding context, even if
@@ -121,7 +121,7 @@ object PickledQuotes {
   }
 
   /** Replace all type holes generated with the spliced types */
-  private def spliceTypes(tree: Tree, typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Int], scala.quoted.QuoteContext) => Any)(using Context): Tree = {
+  private def spliceTypes(tree: Tree, typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Int], scala.quoted.Quotes) => Any)(using Context): Tree = {
     tree match
       case Block(stat :: rest, expr1) if stat.symbol.hasAnnotation(defn.InternalQuoted_SplicedTypeAnnot) =>
         val typeSpliceMap = (stat :: rest).iterator.map {

compiler/src/dotty/tools/dotc/quoted/QuoteContextImpl.scala renamed to compiler/src/dotty/tools/dotc/quoted/QuotesImpl.scala

@@ -13,21 +13,21 @@ import dotty.tools.dotc.quoted.reflect._
 import dotty.tools.dotc.quoted.QuoteUtils._
 import dotty.tools.dotc.core.Decorators._
 
-import scala.quoted.QuoteContext
+import scala.quoted.Quotes
 import scala.quoted.internal.{QuoteUnpickler, QuoteMatching}
 import dotty.tools.dotc.quoted.printers.{Extractors, SourceCode, SyntaxHighlight}
 
 import scala.tasty.reflect._
 
-object QuoteContextImpl {
+object QuotesImpl {
 
   type ScopeId = Int
 
-  def apply()(using Context): QuoteContext =
-    new QuoteContextImpl(ctx)
+  def apply()(using Context): Quotes =
+    new QuotesImpl(ctx)
 
   def showDecompiledTree(tree: tpd.Tree)(using Context): String = {
-    val qctx: QuoteContextImpl = new QuoteContextImpl(MacroExpansion.context(tree))
+    val qctx: QuotesImpl = new QuotesImpl(MacroExpansion.context(tree))
     if ctx.settings.color.value == "always" then
       qctx.reflect.TreeMethodsImpl.temporaryShowAnsiColored(tree)
     else
@@ -41,7 +41,7 @@ object QuoteContextImpl {
 
 }
 
-class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickler, QuoteMatching:
+class QuotesImpl private (ctx: Context) extends Quotes, QuoteUnpickler, QuoteMatching:
 
   extension [T](self: scala.quoted.Expr[T]):
     def show: String =
@@ -55,7 +55,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
 
     def asReflectTree: reflect.Term =
       val expr = self.asInstanceOf[ExprImpl]
-      expr.checkScopeId(QuoteContextImpl.this.hashCode)
+      expr.checkScopeId(QuotesImpl.this.hashCode)
       expr.tree
 
   end extension
@@ -94,11 +94,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
         def pos: Position = self.sourcePos
         def symbol: Symbol = self.symbol
         def showExtractors: String =
-          Extractors.showTree(using QuoteContextImpl.this)(self)
+          Extractors.showTree(using QuotesImpl.this)(self)
         def show: String =
-          SourceCode.showTree(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
+          SourceCode.showTree(using QuotesImpl.this)(self)(SyntaxHighlight.plain)
         def showAnsiColored: String =
-          SourceCode.showTree(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
+          SourceCode.showTree(using QuotesImpl.this)(self)(SyntaxHighlight.ANSI)
         def isExpr: Boolean =
           self match
             case TermTypeTest(self) =>
@@ -108,15 +108,15 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
             case _ => false
         def asExpr: scala.quoted.Expr[Any] =
           if self.isExpr then
-            new ExprImpl(self, QuoteContextImpl.this.hashCode)
+            new ExprImpl(self, QuotesImpl.this.hashCode)
           else self match
             case TermTypeTest(self) => throw new Exception("Expected an expression. This is a partially applied Term. Try eta-expanding the term first.")
             case _ => throw new Exception("Expected a Term but was: " + self)
       end extension
 
       extension [T](self: Tree)
         def asExprOf(using tp: scala.quoted.Type[T]): scala.quoted.Expr[T] =
-          QuoteContextImpl.this.asExprOf[T](self.asExpr)(using tp)
+          QuotesImpl.this.asExprOf[T](self.asExpr)(using tp)
       end extension
 
     end TreeMethodsImpl
@@ -352,11 +352,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
     object TermMethodsImpl extends TermMethods:
       extension (self: Term):
         def seal: scala.quoted.Expr[Any] =
-          if self.isExpr then new ExprImpl(self, QuoteContextImpl.this.hashCode)
+          if self.isExpr then new ExprImpl(self, QuotesImpl.this.hashCode)
           else throw new Exception("Cannot seal a partially applied Term. Try eta-expanding the term first.")
 
         def sealOpt: Option[scala.quoted.Expr[Any]] =
-          if self.isExpr then Some(new ExprImpl(self, QuoteContextImpl.this.hashCode))
+          if self.isExpr then Some(new ExprImpl(self, QuotesImpl.this.hashCode))
           else None
 
         def tpe: TypeRepr = self.tpe
@@ -1634,18 +1634,18 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
     object TypeReprMethodsImpl extends TypeReprMethods:
       extension (self: TypeRepr):
         def showExtractors: String =
-          Extractors.showType(using QuoteContextImpl.this)(self)
+          Extractors.showType(using QuotesImpl.this)(self)
 
         def show: String =
-          SourceCode.showType(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
+          SourceCode.showType(using QuotesImpl.this)(self)(SyntaxHighlight.plain)
 
         def showAnsiColored: String =
-          SourceCode.showType(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
+          SourceCode.showType(using QuotesImpl.this)(self)(SyntaxHighlight.ANSI)
 
         def seal: scala.quoted.Type[_] = self.asType
 
         def asType: scala.quoted.Type[?] =
-          new TypeImpl(Inferred(self), QuoteContextImpl.this.hashCode)
+          new TypeImpl(Inferred(self), QuotesImpl.this.hashCode)
 
         def =:=(that: TypeRepr): Boolean = self =:= that
         def <:<(that: TypeRepr): Boolean = self <:< that
@@ -2219,11 +2219,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
       extension (self: Constant):
         def value: Any = self.value
         def showExtractors: String =
-          Extractors.showConstant(using QuoteContextImpl.this)(self)
+          Extractors.showConstant(using QuotesImpl.this)(self)
         def show: String =
-          SourceCode.showConstant(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
+          SourceCode.showConstant(using QuotesImpl.this)(self)(SyntaxHighlight.plain)
         def showAnsiColored: String =
-          SourceCode.showConstant(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
+          SourceCode.showConstant(using QuotesImpl.this)(self)(SyntaxHighlight.ANSI)
       end extension
     end ConstantMethodsImpl
 
@@ -2442,11 +2442,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
         def children: List[Symbol] = self.denot.children
 
         def showExtractors: String =
-          Extractors.showSymbol(using QuoteContextImpl.this)(self)
+          Extractors.showSymbol(using QuotesImpl.this)(self)
         def show: String =
-          SourceCode.showSymbol(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
+          SourceCode.showSymbol(using QuotesImpl.this)(self)(SyntaxHighlight.plain)
         def showAnsiColored: String =
-          SourceCode.showSymbol(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
+          SourceCode.showSymbol(using QuotesImpl.this)(self)(SyntaxHighlight.ANSI)
 
       end extension
 
@@ -2578,11 +2578,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
         def |(that: Flags): Flags = dotc.core.Flags.or(self, that) // TODO: Replace with dotc.core.Flags.|(self)(that)  once extension names have stabilized
         def &(that: Flags): Flags = dotc.core.Flags.and(self, that)// TODO: Replace with dotc.core.Flags.&(self)(that)  once extension names have stabilized
         def showExtractors: String =
-          Extractors.showFlags(using QuoteContextImpl.this)(self)
+          Extractors.showFlags(using QuotesImpl.this)(self)
         def show: String =
-          SourceCode.showFlags(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
+          SourceCode.showFlags(using QuotesImpl.this)(self)(SyntaxHighlight.plain)
         def showAnsiColored: String =
-          SourceCode.showFlags(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
+          SourceCode.showFlags(using QuotesImpl.this)(self)(SyntaxHighlight.ANSI)
       end extension
     end FlagsMethodsImpl
 
@@ -2658,18 +2658,18 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
 
   end reflect
 
-  def unpickleExpr[T](pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?]): scala.quoted.Expr[T] =
+  def unpickleExpr[T](pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.Quotes) => scala.quoted.Expr[?]): scala.quoted.Expr[T] =
     val tree = PickledQuotes.unpickleTerm(pickled, typeHole, termHole)(using reflect.rootContext)
     new ExprImpl(tree, hash).asInstanceOf[scala.quoted.Expr[T]]
 
-  def unpickleType[T <: AnyKind](pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?]): scala.quoted.Type[T] =
+  def unpickleType[T <: AnyKind](pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.Quotes) => scala.quoted.Expr[?]): scala.quoted.Type[T] =
     val tree = PickledQuotes.unpickleTypeTree(pickled, typeHole, termHole)(using reflect.rootContext)
     new TypeImpl(tree, hash).asInstanceOf[scala.quoted.Type[T]]
 
   object ExprMatch extends ExprMatchModule:
     def unapply[TypeBindings <: Tuple, Tup <: Tuple](scrutinee: scala.quoted.Expr[Any])(using pattern: scala.quoted.Expr[Any]): Option[Tup] =
-      val scrutineeTree = QuoteContextImpl.this.asReflectTree(scrutinee)
-      val patternTree = QuoteContextImpl.this.asReflectTree(pattern)
+      val scrutineeTree = QuotesImpl.this.asReflectTree(scrutinee)
+      val patternTree = QuotesImpl.this.asReflectTree(pattern)
       treeMatch(scrutineeTree, patternTree).asInstanceOf[Option[Tup]]
   end ExprMatch
 
@@ -2708,7 +2708,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
         ctx1.gadt.addToConstraint(typeHoles)
         ctx1
 
-    val qctx1 = dotty.tools.dotc.quoted.QuoteContextImpl()(using ctx1)
+    val qctx1 = dotty.tools.dotc.quoted.QuotesImpl()(using ctx1)
 
     val matcher = new Matcher.QuoteMatcher[qctx1.type](qctx1) {
       def patternHoleSymbol: qctx1.reflect.Symbol = dotc.core.Symbols.defn.InternalQuotedPatterns_patternHole.asInstanceOf
@@ -2732,7 +2732,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
     }
   }
 
-  private[this] val hash = QuoteContextImpl.scopeId(using ctx)
+  private[this] val hash = QuotesImpl.scopeId(using ctx)
   override def hashCode: Int = hash
 
-end QuoteContextImpl
+end QuotesImpl

compiler/src/dotty/tools/dotc/quoted/TypeImpl.scala

@@ -15,7 +15,7 @@ final class TypeImpl(val typeTree: tpd.Tree, val scopeId: Int) extends scala.quo
   }
 
   /** View this expression `quoted.Type[T]` as a `TypeTree` */
-  def unseal(using qctx: QuoteContext): qctx.reflect.TypeTree =
+  def unseal(using qctx: Quotes): qctx.reflect.TypeTree =
     checkScopeId(qctx.hashCode)
     typeTree.asInstanceOf[qctx.reflect.TypeTree]