Cleanup Toolbox

Author: nicolasstucki

library/src/scala/quoted/Toolbox.scala

@@ -16,15 +16,30 @@ object Toolbox {
     implicit def make(implicit settings: Settings): Toolbox = Toolbox.make
   }
 
-  @forceInline def make4(implicit settings: Settings): Toolbox = {
+  /** Create a new instance of the toolbox.
+    *
+    * This instance of the toolbox tries to recover the classloader of the application based on
+    * the classloader of the class that call make. This may not always be the correct classloader.
+    *
+    * @param settings TODO
+    * @return
+    */
+  @forceInline def make(implicit settings: Settings): Toolbox = {
     // TODO find the name of the class that needs to be loaded. Maybe from a stack trace.
 
     // We force inline to make forName use the classloader of the class at callsite
-    val cl = Class.forName("hello.Main").getClassLoader
-    make2(cl)
+    val clazz = Class.forName("hello.Main")
+    val cl = clazz.getClassLoader
+    make(cl)
   }
 
-  def make2(cl: ClassLoader)(implicit settings: Settings): Toolbox = {
+  /** Create a new instance of the toolbox
+    *
+    * @param cl TODO
+    * @param settings TODO
+    * @return A new instance of the toolbox
+    */
+  def make(cl: ClassLoader)(implicit settings: Settings): Toolbox = {
     try {
       val toolboxImplCls = cl.loadClass("dotty.tools.dotc.quoted.ToolboxImpl")
       val makeMeth = toolboxImplCls.getMethod("make2", classOf[Settings], classOf[ClassLoader])
@@ -39,30 +54,6 @@ object Toolbox {
     }
   }
 
-  @inline
-  def make3(implicit settings: Settings): Toolbox = {
-    val cls = Class.forName("hello.Main")
-    val cl = cls.getClassLoader()
-    make2(cl)
-  }
-
-  def make(implicit settings: Settings): Toolbox = {
-    val cl = getClass.getClassLoader
-
-    try {
-      val toolboxImplCls = cl.loadClass("dotty.tools.dotc.quoted.ToolboxImpl")
-      val makeMeth = toolboxImplCls.getMethod("make", classOf[Settings])
-      makeMeth.invoke(null, settings).asInstanceOf[Toolbox]
-    }
-    catch {
-      case ex: ClassNotFoundException =>
-        throw new ToolboxNotFoundException(
-          s"""Could not load the Toolbox class `${ex.getMessage}` from the JVM classpath. Make sure that the compiler is on the JVM classpath.""",
-          ex
-        )
-    }
-  }
-
   /** Setting of the Toolbox instance. */
   case class Settings private (outDir: Option[String], showRawTree: Boolean, compilerArgs: List[String], color: Boolean)
 

sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/main/scala/hello/Hello.scala

@@ -5,10 +5,7 @@ import scala.quoted._
 
 object Main {
 
-//  val cl = Class.forName("hello.Main").getClassLoader
-//  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make2(cl)
-
-  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make4
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
 
   def main(args: Array[String]): Unit = {
     val square = stagedPower(2)

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

@@ -393,7 +393,6 @@ object DottyPlugin extends AutoPlugin {
   ): ScalaInstance = {
     val loader = state.classLoaderCache(all.toList)
     val loaderLibraryOnly = state.classLoaderCache(List(dottyLibrary, scalaLibrary))
-
     new ScalaInstance(
       dottyVersion,
       loader,