Require QuoteContext warning on quotes

Author: nicolasstucki

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

@@ -360,20 +360,10 @@ object Splicer {
 
       // Interpret `foo(j = x, i = y)` which it is expanded to
       // `val j$1 = x; val i$1 = y; foo(i = y, j = x)`
-      case Block(stats, expr) =>
-        var unexpected: Option[Result] = None
-        val newEnv = stats.foldLeft(env)((accEnv, stat) => stat match {
-          case stat: ValDef if stat.symbol.is(Synthetic) =>
-            accEnv.updated(stat.name, interpretTree(stat.rhs)(accEnv))
-          case stat =>
-            if (unexpected.isEmpty)
-              unexpected = Some(unexpectedTree(stat))
-            accEnv
-        })
-        unexpected.getOrElse(interpretTree(expr)(newEnv))
+      case Block(stats, expr) => interpretBlock(stats, expr)
       case NamedArg(_, arg) => interpretTree(arg)
 
-      case Inlined(_, Nil, expansion) => interpretTree(expansion)
+      case Inlined(_, bindings, expansion) => interpretBlock(bindings, expansion)
 
       case Typed(expr, _) =>
         interpretTree(expr)
@@ -385,6 +375,19 @@ object Splicer {
         unexpectedTree(tree)
     }
 
+    private def interpretBlock(stats: List[Tree], expr: Tree)(implicit env: Env) = {
+      var unexpected: Option[Result] = None
+      val newEnv = stats.foldLeft(env)((accEnv, stat) => stat match {
+        case stat: ValDef if stat.symbol.is(Synthetic) =>
+          accEnv.updated(stat.name, interpretTree(stat.rhs)(accEnv))
+        case stat =>
+          if (unexpected.isEmpty)
+            unexpected = Some(unexpectedTree(stat))
+          accEnv
+      })
+      unexpected.getOrElse(interpretTree(expr)(newEnv))
+    }
+
     object Call {
       def unapply(arg: Tree): Option[(RefTree, List[Tree])] = arg match {
         case Select(Call(fn, args), nme.apply) if defn.isImplicitFunctionType(fn.tpe.widenDealias.finalResultType) =>

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1955,6 +1955,13 @@ class Typer extends Namer
    *  while tracking the quotation level in the context.
    */
   def typedQuote(tree: untpd.Quote, pt: Type)(implicit ctx: Context): Tree = track("typedQuote") {
+    /** Fails if there is no implicit QuoteContext */
+    def checkQuoteContext(): Unit = {
+      val qctx = inferImplicitArg(defn.QuoteContextType, tree.span)
+      if (level == 0 && qctx.tpe.isInstanceOf[SearchFailureType])
+        ctx.error(missingArgMsg(qctx, defn.QuoteContextType, ""), ctx.source.atSpan(tree.span))
+    }
+
     tree.quoted match {
       case untpd.Splice(innerExpr) if tree.isTerm =>
         ctx.warning("Canceled splice directly inside a quote. '{ ${ XYZ } } is equivalent to XYZ.", tree.sourcePos)
@@ -1963,9 +1970,11 @@ class Typer extends Namer
         ctx.warning("Canceled splice directly inside a quote. '[ ${ XYZ } ] is equivalent to XYZ.", tree.sourcePos)
         typed(innerType, pt)
       case quoted if quoted.isType =>
+        checkQuoteContext()
         ctx.compilationUnit.needsStaging = true
         typedTypeApply(untpd.TypeApply(untpd.ref(defn.InternalQuoted_typeQuoteR), quoted :: Nil), pt)(quoteContext).withSpan(tree.span)
       case quoted =>
+        checkQuoteContext()
         ctx.compilationUnit.needsStaging = true
         if (ctx.mode.is(Mode.Pattern) && level == 0)
           typedQuotePattern(quoted, pt, tree.span)

tests/neg-custom-args/fatal-warnings/quote-simple-hole.scala

@@ -1,4 +1,6 @@
-class Test {
+import scala.quoted.QuoteContext
+
+def test given QuoteContext = {
   val x = '{0}
   val y = '{ // error: Canceled splice directly inside a quote. '{ ${ XYZ } } is equivalent to XYZ.
     $x

tests/neg-macros/quote-complex-top-splice.scala

@@ -24,6 +24,6 @@ object Test {
     impl(1)
   }
 
-  def impl(i: Int): Expr[Unit] = '{}
+  def impl(i: Int) given QuoteContext: Expr[Unit] = '{}
 
 }

tests/neg-macros/quote-error/Macro_1.scala

@@ -2,7 +2,7 @@ import quoted._
 
 object Macro_1 {
   inline def foo(inline b: Boolean): Unit = ${fooImpl(b)}
-  def fooImpl(b: Boolean): Expr[Unit] =
+  def fooImpl(b: Boolean) given QuoteContext: Expr[Unit] =
     if (b) '{println("foo(true)")}
     else QuoteError("foo cannot be called with false")
 }

tests/neg-macros/quote-exception/Macro_1.scala

@@ -2,7 +2,7 @@ import quoted._
 
 object Macro_1 {
   inline def foo(inline b: Boolean): Unit = ${fooImpl(b)}
-  def fooImpl(b: Boolean): Expr[Unit] =
+  def fooImpl(b: Boolean) given QuoteContext: Expr[Unit] =
     if (b) '{println("foo(true)")}
     else ???
 }

tests/neg-macros/quote-this-b.scala

@@ -6,5 +6,5 @@ class Foo {
 }
 
 object Foo {
-  def impl[T](x: Any): Expr[Unit] = '{}
+  def impl[T](x: Any) given QuoteContext: Expr[Unit] = '{}
 }

tests/neg-macros/quote-this.scala

@@ -2,7 +2,7 @@ import scala.quoted._
 
 class Foo {
 
-  def f: Unit = '{
+  def f given QuoteContext: Unit = '{
     def bar[T](x: T): T = x
     bar[
       this.type  // error
@@ -22,5 +22,5 @@ class Foo {
 }
 
 object Foo {
-  def impl[T](x: Any): Expr[Unit] = '{}
+  def impl[T](x: Any) given QuoteContext: Expr[Unit] = '{}
 }

tests/neg-macros/splice-in-top-level-splice-1.scala

@@ -3,6 +3,6 @@ import scala.quoted.autolift._
 
 object Foo {
   inline def foo(): Int = ${bar(${x})} // error
-  def x: Expr[Int] = '{1}
+  def x given QuoteContext: Expr[Int] = '{1}
   def bar(i: Int) given QuoteContext: Expr[Int] = i
 }

tests/neg-macros/splice-in-top-level-splice-2.scala

@@ -2,5 +2,5 @@ import scala.quoted._
 
 object Foo {
   inline def foo(): Int = ${$x} // error
-  def x: Expr[Expr[Int]] = '{ '{1} }
+  def x given QuoteContext: Expr[Expr[Int]] = '{ '{1} }
 }

tests/neg/i4044a.scala

@@ -1,6 +1,6 @@
 import scala.quoted._
 
-class Test {
+def test given QuoteContext = {
 
   val a = '{1}
   '{

tests/neg/i4044b.scala

@@ -1,6 +1,6 @@
 import scala.quoted._
 
-class Test {
+def test given QuoteContext = {
 
   '{
 

tests/neg/i4774b.scala

@@ -2,7 +2,7 @@
 import scala.quoted._
 
 object Test {
-  def loop[T](x: Expr[T])(implicit t: Type[T]): Expr[T] = '{
+  def loop[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] = '{
     val y: $t = $x;
     ${loop[$t]( // error
       'y

tests/neg/i6530b.scala

@@ -1,5 +1,6 @@
+import scala.quoted._
 object Foo {
-  val program = '{
+  def program given QuoteContext = '{
     val tpe: quoted.Type[Int] = ???
     val expr: quoted.Expr[Int] = ???
 

tests/neg/quote-0.scala

@@ -1,6 +1,6 @@
 import scala.quoted._
 
-class Test {
+def test given QuoteContext = {
 
   val x: Int = 0
 

tests/neg/quote-1.scala

@@ -2,11 +2,11 @@ import scala.quoted._
 
 class Test {
 
-  def f[T](t: Type[T], x: Expr[T]) = '{
+  def f[T](t: Type[T], x: Expr[T]) given QuoteContext = '{
     val z2 = $x // error // error: wrong staging level
   }
 
-  def g[T](implicit t: Type[T], x: Expr[T]) = '{
+  def g[T](implicit t: Type[T], x: Expr[T], qctx: QuoteContext) = '{
     val z2 = $x   // ok
   }
 

tests/neg/quote-macro-2-splices.scala

@@ -7,5 +7,5 @@ object Macro {
     else ${ bar(false) }
   }
 
-  def bar(b: Boolean): Expr[Int] = if (b) '{1} else '{0}
+  def bar(b: Boolean) given QuoteContext: Expr[Int] = if (b) '{1} else '{0}
 }

tests/neg/quote-spliceNonStaged.scala

@@ -2,6 +2,6 @@ package quotes
 import scala.quoted._
 
 object Quotes_1 {
-  def printHello: Expr[Unit] = '{ println("Hello") }
+  def printHello given QuoteContext: Expr[Unit] = '{ println("Hello") }
   $printHello // error
 }

tests/neg/splice-non-expr.scala

@@ -1,11 +1,12 @@
+import scala.quoted._
 class Foo {
-  '{
+  def test given QuoteContext = '{
     ${3} // error
     ${new Object} // error
     ${"abc"} // error
     ${()} // error
     ${new Foo} // error
   }
 
-  def unary_~ : Int = 9
+  def unary_$ : Int = 9
 }

tests/pos-macros/i3898c/quoted_2.scala

@@ -1,9 +1,7 @@
-object Test {
-  def main(args: Array[String]): Unit = {
-    val a = '{
-      def z: Int = 5
-      Macro.ff(z, 5)
-    }
-
+import scala.quoted._
+def test given QuoteContext = {
+  val a = '{
+    def z: Int = 5
+    Macro.ff(z, 5)
   }
 }

tests/pos-macros/i4023c/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
 object Macro {
-  inline def ff[T](x: T): T = ${ impl('x)('[T]) }
-  def impl[T](x: Expr[T])(implicit t: Type[T]): Expr[T] = '{ $x: $t }
+  inline def ff[T](x: T): T = ${ impl('x)('[T], the[QuoteContext]) }
+  def impl[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] = '{ $x: $t }
 }

tests/pos-macros/i4734/Macro_1.scala

@@ -3,9 +3,9 @@ import scala.quoted._
 
 object Macros {
   inline def unrolledForeach(f: Int => Int): Int =
-   ${unrolledForeachImpl('f)}
+    ${unrolledForeachImpl('f)}
 
-  def unrolledForeachImpl(f: Expr[Int => Int]): Expr[Int] = '{
+  def unrolledForeachImpl(f: Expr[Int => Int]) given QuoteContext: Expr[Int] = '{
     val size: Int = 5
     ($f)(3)
   }

tests/pos-macros/i6210/Macros_1.scala

@@ -4,7 +4,7 @@ object Macro {
   inline def test[A, B]: Any =
     ${ impl[A, B] }
 
-  def impl[A : Type, B : Type]: Expr[Any] = {
+  def impl[A : Type, B : Type] given QuoteContext: Expr[Any] = {
     val t = '[Map[A, B]]
     '{
       new Object().asInstanceOf[$t]

tests/pos-with-compiler/quote-assert/quoted_1.scala

@@ -1,6 +1,6 @@
 import scala.quoted._
 
 object Macros {
-  def assertImpl(expr: Expr[Boolean]) =
+  def assertImpl(expr: Expr[Boolean]) given QuoteContext =
     '{ if !($expr) then throw new AssertionError(s"failed assertion: ${$expr}") }
 }

tests/pos-with-compiler/quote-assert/quoted_2.scala

@@ -8,13 +8,13 @@ object Test {
     ${ assertImpl('expr) }
 
 
-  val program = '{
+  def program given QuoteContext = '{
     val x = 1
     assert(x != 0)
 
     ${ assertImpl('{x != 0}) }
   }
 
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  program.run
+  run(program)
 }

tests/pos/i4350.scala

@@ -1,5 +1,5 @@
-import scala.quoted.Type
+import scala.quoted._
 
-class Foo[T: Type] {
+class Foo[T: Type] given QuoteContext {
   '{null.asInstanceOf[T]}
 }

tests/pos/i4380a.scala

@@ -3,7 +3,7 @@ import scala.quoted._
 object Test {
 
   trait Producer[A] { self =>
-    def step(k: (A => Expr[Unit])): Expr[Unit]
+    def step(k: (A => Expr[Unit])) given QuoteContext: Expr[Unit]
   }
 
   trait Foo[A]
@@ -13,7 +13,7 @@ object Test {
     stream match {
       case Bar(producer, nestedf) => {
         new Producer[Expr[A]] {
-          def step(k: Expr[A] => Expr[Unit]): Expr[Unit] = '{
+          def step(k: Expr[A] => Expr[Unit]) given QuoteContext: Expr[Unit] = '{
             val adv: Unit => Unit = { _ => ${producer.step((el) => nestedf(el))} }
           }
         }

tests/pos/i4396a.scala

@@ -1,3 +1,4 @@
-class Test {
+import scala.quoted._
+def test given QuoteContext = {
   '{ Option(4) match { case Some(a) => a; case None => 1 }}
-}
+}

tests/pos/i4396b.scala

@@ -1,3 +1,4 @@
-class Test {
+import scala.quoted._
+def test given QuoteContext = {
   '{ case class Foo() }
 }

tests/pos/i4539.scala

@@ -1,4 +1,5 @@
-object Foo {
+import scala.quoted._
+def test given QuoteContext = {
   val q = '[String]
   '[String]
 }

tests/pos/i4539b.scala

@@ -1,4 +1,5 @@
-object Foo {
+import scala.quoted._
+def test given QuoteContext = {
   def f = {
     {
       '[String]

tests/pos/i4774a.scala

@@ -2,7 +2,7 @@
 import scala.quoted._
 
 object Test {
-  def loop[T](x: Expr[T])(implicit t: Type[T]): Expr[T] = '{
+  def loop[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] = '{
     val y: $t = $x
     ${loop('y)}
   }

tests/pos/i4774c.scala

@@ -2,5 +2,5 @@
 import scala.quoted._
 
 object Test {
-  def loop[T](x: Expr[T])(implicit t: Type[T]): Expr[T] = '{ val y = $x; ${loop('y)} }
+  def loop[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] = '{ val y = $x; ${loop('y)} }
 }

tests/pos/i4774d.scala

@@ -2,6 +2,6 @@
 import scala.quoted._
 
 object Test {
-  def loop[T](x: Expr[T])(implicit t: Type[T]): Expr[T] =
+  def loop[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] =
     '{ val y: T = $x; ${loop('y)} }
 }

tests/pos/i4774e.scala

@@ -2,9 +2,9 @@
 import scala.quoted._
 
 object Test {
-  def loop[T](x: Expr[T])(implicit t: Type[T]): Expr[T] =
+  def loop[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] =
     '{ def y = $x; ${ loop('y) } }
 
-  def loop2[T](x: Expr[T])(implicit t: Type[T]): Expr[T] =
-  '{ def y() = $x; ${ loop('{y()}) } }
+  def loop2[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] =
+    '{ def y() = $x; ${ loop('{y()}) } }
 }

tests/pos/i4774f.scala

@@ -2,9 +2,9 @@
 import scala.quoted._
 
 object Test {
-  def loop[T](x: Expr[T])(implicit t: Type[T]): Expr[T] =
+  def loop[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] =
     '{ def y: T = $x; ${ loop('y) } }
 
-  def loop2[T](x: Expr[T])(implicit t: Type[T]): Expr[T] =
+  def loop2[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] =
     '{ def y(): T = $x; ${ loop2('{y()}) } }
 }