WIP

Author: nicolasstucki

compiler/src/dotty/tools/dotc/consumetasty/ConsumeTasty.scala

@@ -16,7 +16,7 @@ object ConsumeTasty {
         new TastyFromClass(tastyConsumer)
     }
 
-    val currentClasspath = QuoteDriver.currentClasspath
+    val currentClasspath = QuoteDriver.currentClasspath(getClass.getClassLoader)
     import java.io.File.{ pathSeparator => sep }
     val args = "-from-tasty" :: "-Yretain-trees" :: "-classpath" :: s"$classpath$sep$currentClasspath" :: classes
     (new Consume).process(args.toArray)

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

@@ -87,7 +87,7 @@ class QuoteDriver(cl: ClassLoader) extends Driver {
 
   override def initCtx: Context = {
     val ictx = contextBase.initialCtx
-    ictx.settings.classpath.update(QuoteDriver.currentClasspath)(ictx)
+    ictx.settings.classpath.update(QuoteDriver.currentClasspath(cl))(ictx)
     ictx
   }
 
@@ -99,9 +99,9 @@ class QuoteDriver(cl: ClassLoader) extends Driver {
 
 object QuoteDriver {
 
-  def currentClasspath: String = {
+  def currentClasspath(cl: ClassLoader): String = {
     val classpath0 = System.getProperty("java.class.path")
-    this.getClass.getClassLoader match {
+    cl match {
       case cl: URLClassLoader =>
         // Loads the classes loaded by this class loader
         // When executing `run` or `test` in sbt the classpath is not in the property java.class.path

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

@@ -11,7 +11,7 @@ object ToolboxImpl {
 
   def make(settings: scala.quoted.Toolbox.Settings): scala.quoted.Toolbox = new scala.quoted.Toolbox {
 
-    private[this] val driver: QuoteDriver = new QuoteDriver()
+    private[this] val driver: QuoteDriver = new QuoteDriver(getClass.getClassLoader)
 
     def run[T](expr: Expr[T]): T = expr match {
       case expr: LiftedExpr[T] =>
@@ -27,9 +27,9 @@ object ToolboxImpl {
     def show[T](tpe: Type[T]): String = synchronized(driver.show(tpe, settings))
   }
 
-  def make2(settings: scala.quoted.Toolbox.Settings): scala.quoted.Toolbox = new scala.quoted.Toolbox {
+  def make2(settings: scala.quoted.Toolbox.Settings, cl: ClassLoader): scala.quoted.Toolbox = new scala.quoted.Toolbox {
 
-    private[this] val driver: QuoteDriver = new QuoteDriver()
+    private[this] val driver: QuoteDriver = new QuoteDriver(cl)
 
     def run[T](expr: Expr[T]): T = expr match {
       case expr: LiftedExpr[T] =>
@@ -42,5 +42,7 @@ object ToolboxImpl {
 
     def show[T](expr: Expr[T]): String = synchronized(driver.show(expr, settings))
 
+    def show[T](tpe: Type[T]): String = synchronized(driver.show(tpe, settings))
   }
+
 }

library/src/scala/quoted/Toolbox.scala

@@ -19,7 +19,7 @@ object Toolbox {
   def make2(cl: ClassLoader)(implicit settings: Settings): Toolbox = {
     try {
       val toolboxImplCls = cl.loadClass("dotty.tools.dotc.quoted.ToolboxImpl")
-      val makeMeth = toolboxImplCls.getMethod("make2", classOf[Settings])
+      val makeMeth = toolboxImplCls.getMethod("make2", classOf[Settings], classOf[ClassLoader])
       makeMeth.invoke(null, settings, cl).asInstanceOf[Toolbox]
     }
     catch {