Rename QuoteContext to Quotes

`QuoteContext` is required on all signatures. To make it simpler to keep signatures on one line we shorten the name to `Quotes`. This name will usually be used in `(using Quotes)` which reads as _using quotes_ and descibes exactly why this contextual parameter is the.

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

Author: nicolasstucki

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

@@ -797,7 +797,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 QuoteContextClass: ClassSymbol = requiredClass("scala.quoted.Quotes")
 
   @tu lazy val QuoteUnpicklerClass: ClassSymbol = requiredClass("scala.quoted.runtime.QuoteUnpickler")
     @tu lazy val QuoteUnpickler_unpickleExpr: Symbol = QuoteUnpicklerClass.requiredMethod("unpickleExpr")

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

@@ -11,7 +11,7 @@ import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.tasty.TastyPrinter
 import dotty.tools.io.File
 
-import scala.quoted.runtime.impl.QuoteContextImpl
+import scala.quoted.runtime.impl.QuotesImpl
 
 /** Phase that prints the trees in all loaded compilation units.
  *
@@ -45,7 +45,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

@@ -7,7 +7,7 @@ import dotty.tools.dotc.core._
 import dotty.tools.dotc.core.tasty.TastyHTMLPrinter
 import dotty.tools.dotc.reporting._
 
-import scala.quoted.runtime.impl.QuoteContextImpl
+import scala.quoted.runtime.impl.QuotesImpl
 
 /**
   * Decompiler to be used with IDEs
@@ -35,7 +35,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/PickledQuotes.scala

@@ -41,14 +41,14 @@ object PickledQuotes {
   /** Transform the expression into its fully spliced Tree */
   def quotedExprToTree[T](expr: quoted.Expr[T])(using Context): Tree = {
     val expr1 = expr.asInstanceOf[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[TypeImpl]
-    tpe1.checkScopeId(QuoteContextImpl.scopeId)
+    tpe1.checkScopeId(QuotesImpl.scopeId)
     changeOwnerOfTree(tpe1.typeTree, ctx.owner)
   }
 
@@ -74,11 +74,11 @@ object PickledQuotes {
       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 ExprImpl(arg, QuoteContextImpl.scopeId)
-            else new TypeImpl(arg, QuoteContextImpl.scopeId)
+            if (arg.isTerm) (using qctx: QuoteContext) => new ExprImpl(arg, QuotesImpl.scopeId)
+            else new TypeImpl(arg, QuotesImpl.scopeId)
           }
           if isTerm then
-            val quotedExpr = termHole(idx, reifiedArgs, QuoteContextImpl())
+            val quotedExpr = termHole(idx, reifiedArgs, 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

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -52,7 +52,7 @@ object Splicer {
 
             // Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree
             val interpretedExpr = interpreter.interpret[QuoteContext => scala.quoted.Expr[Any]](tree)
-            val interpretedTree = interpretedExpr.fold(tree)(macroClosure => PickledQuotes.quotedExprToTree(macroClosure(QuoteContextImpl())))
+            val interpretedTree = interpretedExpr.fold(tree)(macroClosure => PickledQuotes.quotedExprToTree(macroClosure(QuotesImpl())))
 
             checkEscapedVariables(interpretedTree, macroOwner)
           } finally {
@@ -325,10 +325,10 @@ object Splicer {
     }
 
     private def interpretQuote(tree: Tree)(implicit env: Env): Object =
-      new ExprImpl(Inlined(EmptyTree, Nil, QuoteUtils.changeOwnerOfTree(tree, ctx.owner)).withSpan(tree.span), QuoteContextImpl.scopeId)
+      new ExprImpl(Inlined(EmptyTree, Nil, QuoteUtils.changeOwnerOfTree(tree, ctx.owner)).withSpan(tree.span), QuotesImpl.scopeId)
 
     private def interpretTypeQuote(tree: Tree)(implicit env: Env): Object =
-      new TypeImpl(QuoteUtils.changeOwnerOfTree(tree, ctx.owner), QuoteContextImpl.scopeId)
+      new TypeImpl(QuoteUtils.changeOwnerOfTree(tree, ctx.owner), QuotesImpl.scopeId)
 
     private def interpretLiteral(value: Any)(implicit env: Env): Object =
       value.asInstanceOf[Object]

compiler/src/scala/quoted/runtime/impl/QuoteContextImpl.scala renamed to compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala

@@ -21,15 +21,15 @@ import scala.quoted.runtime.impl.printers._
 
 import scala.reflect.TypeTest
 
-object QuoteContextImpl {
+object QuotesImpl {
 
   type ScopeId = Int
 
   def apply()(using Context): QuoteContext =
-    new QuoteContextImpl
+    new QuotesImpl
 
   def showDecompiledTree(tree: tpd.Tree)(using Context): String = {
-    val qctx: QuoteContextImpl = new QuoteContextImpl(using MacroExpansion.context(tree))
+    val qctx: QuotesImpl = new QuotesImpl(using MacroExpansion.context(tree))
     if ctx.settings.color.value == "always" then
       qctx.reflect.TreeMethodsImpl.temporaryShowAnsiColored(tree)
     else
@@ -43,7 +43,7 @@ object QuoteContextImpl {
 
 }
 
-class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, QuoteUnpickler, QuoteMatching:
+class QuotesImpl private (using val ctx: Context) extends QuoteContext, QuoteUnpickler, QuoteMatching:
 
   private val yCheck: Boolean =
     ctx.settings.Ycheck.value(using ctx).exists(x => x == "all" || x == "macros")
@@ -92,11 +92,11 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
         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) =>
@@ -106,15 +106,15 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
             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
 
       extension [ThisTree <: Tree](self: ThisTree):
@@ -332,7 +332,7 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
     object Term extends TermModule:
       def of(expr: Expr[Any]): Term =
         val exprImpl = expr.asInstanceOf[ExprImpl]
-        exprImpl.checkScopeId(QuoteContextImpl.this.hashCode)
+        exprImpl.checkScopeId(QuotesImpl.this.hashCode)
         exprImpl.tree
 
       def betaReduce(tree: Term): Option[Term] =
@@ -352,11 +352,11 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
     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
@@ -1559,18 +1559,18 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
     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
@@ -2124,11 +2124,11 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
       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
 
@@ -2330,11 +2330,11 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
         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
 
@@ -2467,11 +2467,11 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
         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
 
@@ -2643,7 +2643,7 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
         ctx1.gadt.addToConstraint(typeHoles)
         ctx1
 
-    val qctx1 = QuoteContextImpl()(using ctx1)
+    val qctx1 = QuotesImpl()(using ctx1)
 
     val matcher = new Matcher.QuoteMatcher[qctx1.type](qctx1) {
       def patternHoleSymbol: qctx1.reflect.Symbol = dotc.core.Symbols.defn.QuotedRuntimePatterns_patternHole.asInstanceOf
@@ -2667,7 +2667,7 @@ class QuoteContextImpl private (using val ctx: Context) extends QuoteContext, Qu
     }
   }
 
-  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

docs/docs/reference/changed-features/numeric-literals.md

@@ -206,7 +206,7 @@ no code that can be executed at runtime. That is why we define an intermediary c
 method in the `FromDigits` given instance. That method is defined in terms of a macro
 implementation method `fromDigitsImpl`. Here is its definition:
 ```scala
-  private def fromDigitsImpl(digits: Expr[String])(using ctx: QuoteContext): Expr[BigFloat] =
+  private def fromDigitsImpl(digits: Expr[String])(using ctx: Quotes): Expr[BigFloat] =
     digits match {
       case Const(ds) =>
         try {

docs/docs/reference/contextual/derivation-macro.md

@@ -25,7 +25,7 @@ we need to implement a method `Eq.derived` on the companion object of `Eq` that
 produces a quoted instance for `Eq[T]`. Here is a possible signature,
 
 ```scala
-given derived[T: Type](using qctx: QuoteContext) as Expr[Eq[T]]
+given derived[T: Type](using qctx: Quotes) as Expr[Eq[T]]
 ```
 
 and for comparison reasons we give the same signature we had with `inline`:
@@ -41,7 +41,7 @@ from the signature. The body of the `derived` method is shown below:
 
 
 ```scala
-given derived[T: Type](using qctx: QuoteContext) as Expr[Eq[T]] = {
+given derived[T: Type](using qctx: Quotes) as Expr[Eq[T]] = {
   import qctx.reflect._
 
   val ev: Expr[Mirror.Of[T]] = Expr.summon[Mirror.Of[T]].get
@@ -91,7 +91,7 @@ The implementation of `summonAll` as a macro can be show below assuming that we
 have the given instances for our primitive types:
 
 ```scala
-  def summonAll[T: Type](using qctx: QuoteContext): List[Expr[Eq[_]]] = Type.of[T] match {
+  def summonAll[T: Type](using qctx: Quotes): List[Expr[Eq[_]]] = Type.of[T] match {
     case '[String *: tpes] => '{ summon[Eq[String]] }  :: summonAll[tpes]
     case '[Int *: tpes]    => '{ summon[Eq[Int]] }     :: summonAll[tpes]
     case '[tpe *: tpes]   => derived[tpe] :: summonAll[tpes]
@@ -169,14 +169,14 @@ object Eq {
       def eqv(x: T, y: T): Boolean = body(x, y)
     }
 
-  def summonAll[T: Type](using qctx: QuoteContext): List[Expr[Eq[_]]] = Type.of[T] match {
+  def summonAll[T: Type](using qctx: Quotes): List[Expr[Eq[_]]] = Type.of[T] match {
     case '[String *: tpes] => '{ summon[Eq[String]] }  :: summonAll[tpes]
     case '[Int *: tpes]    => '{ summon[Eq[Int]] }     :: summonAll[tpes]
     case '[tpe *: tpes]   => derived[tpe] :: summonAll[tpes]
     case '[EmptyTuple] => Nil
   }
 
-  given derived[T: Type](using qctx: QuoteContext) as Expr[Eq[T]] = {
+  given derived[T: Type](using qctx: Quotes) as Expr[Eq[T]] = {
     import qctx.reflect._
 
     val ev: Expr[Mirror.Of[T]] = Expr.summon[Mirror.Of[T]].get