WIP: delegate dotty compiler info to sbt

bridge/src/main/scala/xsbt/CompilerInterface.scala

@@ -57,9 +57,8 @@ class CachedCompilerImpl(args: Array[String], output: Output, resident: Boolean)
   private[this] def run(sources: List[File], changes: DependencyChanges, callback: AnalysisCallback, 
     log: Logger, delegate: Reporter, compileProgress: CompileProgress): Unit = {
     debug(log, args.mkString("Calling Dotty compiler with arguments  (CompilerInterface):\n\t", "\n\t", ""))
-    val ctx = (new ContextBase).initialCtx.fresh
-      .setSbtCallback(callback)
-      .setReporter(DelegatingReporter(delegate))
+    val freshContext = (new ContextBase).initialCtx.fresh
+    val ctx = freshContext.setSbtCallback(callback).setReporter(DelegatingReporter(delegate))
     val cl = getClass.getClassLoader.asInstanceOf[URLClassLoader]
 
     val reporter = DottyMain.process(commandArguments(sources.toArray), ctx)

bridge/src/main/scala/xsbt/DelegatingReporter.scala

@@ -10,11 +10,11 @@ import core.Contexts._
 
 import xsbti.Maybe
 
-private object DelegatingReporter {
+object DelegatingReporter {
   def apply(delegate: xsbti.Reporter) = new DelegatingReporter(delegate)
 }
 
-private final class DelegatingReporter(delegate: xsbti.Reporter) extends Reporter
+final class DelegatingReporter(delegate: xsbti.Reporter) extends Reporter
   with UniqueMessagePositions
   with HideNonSensicalMessages {
 
@@ -38,7 +38,10 @@ private final class DelegatingReporter(delegate: xsbti.Reporter) extends Reporte
       def pointer(): xsbti.Maybe[Integer] = offset()
       def pointerSpace(): xsbti.Maybe[String] = Maybe.just(" " * pos.point)
       def sourceFile(): xsbti.Maybe[java.io.File] = maybe(file)
-      def sourcePath(): xsbti.Maybe[String] = maybe(file.map(_.getPath))        
+      def sourcePath(): xsbti.Maybe[String] = {
+        println(file)
+        maybe(file.map(_.getPath))
+      }
     }
 
     delegate.log(position, d.message, severity)

project/Build.scala

@@ -9,6 +9,8 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 
 object DottyBuild extends Build {
 
+  val cleanBridge = TaskKey[Unit]("clean-sbt-bridge", "delete dotty-sbt-bridge cache")
+
   val baseVersion = "0.1"
   val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes")
 
@@ -237,6 +239,25 @@ object DottyBuild extends Build {
     ).
     settings(ScriptedPlugin.scriptedSettings: _*).
     settings(
+      cleanBridge := {
+        println("*** cleanBridge ***")
+        val dottyBridgeVersion = version.value
+        val dottyVersion = (version in dotty).value
+        val classVersion = System.getProperty("java.class.version")
+        val sbtV = sbtVersion.value
+        val home = System.getProperty("user.home")
+        val org = organization.value
+        val artifact = moduleName.value
+
+        IO.delete(file(home) / ".ivy2" / "local" / "ch.epfl.lamp" / artifact)
+        IO.delete(file(home) / ".ivy2" / "cache" / "org.scala-sbt" / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion")
+        IO.delete(file(home) / ".sbt"  / "boot" / "scala-2.10.6" / "org.scala-sbt" / "sbt" / sbtV / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion")
+      },
+
+      ScriptedPlugin.scripted <<= ScriptedPlugin.scripted
+        .dependsOn(publishLocal) // 2nd
+        .dependsOn(cleanBridge), // 1st
+
       ScriptedPlugin.scriptedLaunchOpts := Seq("-Xmx1024m"),
       ScriptedPlugin.scriptedBufferLog := false
       // TODO: Use this instead of manually copying DottyInjectedPlugin.scala