DelegatingReporter code review suggestions

Author: MasseGuillaume

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

@@ -54,8 +54,10 @@ 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 freshContext = (new ContextBase).initialCtx.fresh
-    val ctx = freshContext.setSbtCallback(callback).setReporter(DelegatingReporter(delegate))
+    val ctx = (new ContextBase).initialCtx.fresh
+      .setSbtCallback(callback)
+      .setReporter(new DelegatingReporter(delegate))
+
     val cl = getClass.getClassLoader.asInstanceOf[URLClassLoader]
 
     val reporter = DottyMain.process(commandArguments(sources.toArray), ctx)

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

@@ -8,11 +8,7 @@ import dotc._
 import reporting._
 import core.Contexts._
 
-import xsbti.Maybe
-
-object DelegatingReporter {
-  def apply(delegate: xsbti.Reporter) = new DelegatingReporter(delegate)
-}
+import xsbti.{Maybe, Position}
 
 final class DelegatingReporter(delegate: xsbti.Reporter) extends Reporter
   with UniqueMessagePositions
@@ -27,28 +23,24 @@ final class DelegatingReporter(delegate: xsbti.Reporter) extends Reporter
         case _: Reporter.Warning => xsbti.Severity.Warn
         case _                   => xsbti.Severity.Info
       }
-    val pos  = 
-      if(d.pos.exists) Some(d.pos)
+    val pos = 
+      if (d.pos.exists) Some(d.pos)
       else None
 
     val file = 
-      if(d.pos.source.file.exists) {
-        val r = d.pos.source.file.file 
-        if(r == null) None
-        else Some(r)
-      }
+      if (d.pos.source.file.exists) Option(d.pos.source.file.file)
       else None
 
     val offset0 = pos.map(_.point)
 
-    val position = new xsbti.Position {
+    val position = new Position {
       def line: Maybe[Integer] = maybe(pos.map(_.line))
-      def lineContent(): String = pos.map(_.lineContent).getOrElse("")
-      def offset(): xsbti.Maybe[Integer] = maybeInt(offset0)
-      def pointer(): xsbti.Maybe[Integer] = offset()
-      def pointerSpace(): xsbti.Maybe[String] = maybe(offset0.map(" " * _))
-      def sourceFile(): xsbti.Maybe[java.io.File] = maybe(file)
-      def sourcePath(): xsbti.Maybe[String] = maybe(file.map(_.getPath))
+      def lineContent: String = pos.map(_.lineContent).getOrElse("")
+      def offset: Maybe[Integer] = maybeInt(offset0)
+      def pointer: Maybe[Integer] = offset
+      def pointerSpace: Maybe[String] = maybe(offset0.map(" " * _))
+      def sourceFile: Maybe[java.io.File] = maybe(file)
+      def sourcePath: Maybe[String] = maybe(file.map(_.getPath))
     }
 
     delegate.log(position, d.message, severity)

project/Build.scala

@@ -208,7 +208,7 @@ object DottyBuild extends Build {
     settings(publishing)
 
   // until sbt/sbt#2402 is fixed (https://github.com/sbt/sbt/issues/2402)
-  lazy val cleanBridge = TaskKey[Unit]("clean-sbt-bridge", "delete dotty-sbt-bridge cache")
+  lazy val cleanBridge = TaskKey[Unit]("cleanSbtBridge", "delete dotty-sbt-bridge cache")
 
   lazy val `dotty-bridge` = project.in(file("bridge")).
     dependsOn(dotty).
@@ -219,16 +219,19 @@ object DottyBuild extends Build {
         val dottyBridgeVersion = version.value
         val dottyVersion = (version in dotty).value
         val classVersion = System.getProperty("java.class.version")
+
         val sbtV = sbtVersion.value
+        val sbtOrg = "org.scala-sbt"
+        val sbtScalaVersion = "2.10.6"
+
         val home = System.getProperty("user.home")
         val org = organization.value
         val artifact = moduleName.value
 
-        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")
+        IO.delete(file(home) / ".ivy2" / "cache" / sbtOrg / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion")
+        IO.delete(file(home) / ".sbt"  / "boot" / s"scala-$sbtScalaVersion" / sbtOrg / "sbt" / sbtV / s"$org-$artifact-$dottyBridgeVersion-bin_${dottyVersion}__$classVersion")
       },
-      publishLocal <<= publishLocal.dependsOn(cleanBridge),
-
+      publishLocal := (publishLocal.dependsOn(cleanBridge)).value,
       description := "sbt compiler bridge for Dotty",
       resolvers += Resolver.typesafeIvyRepo("releases"),
       libraryDependencies ++= Seq(