Tweak compiling / compiled messages

Author: alexarchambault

modules/build/src/main/scala/scala/build/BloopBuildClient.scala

@@ -5,6 +5,7 @@ import ch.epfl.scala.bsp4j
 import java.io.PrintStream
 
 trait BloopBuildClient extends bsp4j.BuildClient {
+  def setProjectParams(newParams: Seq[String]): Unit
   def setGeneratedSources(newGeneratedSources: Seq[GeneratedSource]): Unit
   def diagnostics: Option[Seq[(Either[String, os.Path], bsp4j.Diagnostic)]]
   def clear(): Unit

modules/build/src/main/scala/scala/build/Build.scala

@@ -124,6 +124,7 @@ object Build {
 
     val generatedSources = sources.generateSources(inputs0.generatedSrcRoot)
 
+    buildClient.setProjectParams(options0.projectParams)
     build(
       inputs0,
       sources,

modules/build/src/main/scala/scala/build/ConsoleBloopBuildClient.scala

@@ -16,6 +16,14 @@ class ConsoleBloopBuildClient(
   var generatedSources: Seq[GeneratedSource] = Nil
 ) extends BloopBuildClient {
 
+  private var projectParams = Seq.empty[String]
+
+  private def projectNameSuffix =
+    if (projectParams.isEmpty) ""
+    else " (" + projectParams.mkString(", ") + ")"
+
+  private def projectName = "project" + projectNameSuffix
+
   private var printedStart = false
   private val gray = "\u001b[90m"
   private val reset = Console.RESET
@@ -25,6 +33,9 @@ class ConsoleBloopBuildClient(
   def setGeneratedSources(newGeneratedSources: Seq[GeneratedSource]) = {
     generatedSources = newGeneratedSources
   }
+  def setProjectParams(newParams: Seq[String]): Unit = {
+    projectParams = newParams
+  }
   def diagnostics: Option[Seq[(Either[String, os.Path], bsp4j.Diagnostic)]] =
     if (keepDiagnostics) Some(diagnostics0.result())
     else None
@@ -115,7 +126,10 @@ class ConsoleBloopBuildClient(
     logger.debug("Received onBuildTaskStart from bloop: " + params)
     for (msg <- Option(params.getMessage) if !msg.contains(" no-op compilation")) {
       printedStart = true
-      out.println(gray + msg + reset)
+      val msg0 =
+        if (params.getDataKind == "compile-task") s"Compiling $projectName"
+        else msg
+      out.println(gray + msg0 + reset)
     }
   }
 
@@ -125,8 +139,18 @@ class ConsoleBloopBuildClient(
   override def onBuildTaskFinish(params: bsp4j.TaskFinishParams): Unit = {
     logger.debug("Received onBuildTaskFinish from bloop: " + params)
     if (printedStart)
-      for (msg <- Option(params.getMessage))
-        out.println(gray + msg + reset)
+      for (msg <- Option(params.getMessage)) {
+        val msg0 =
+          if (params.getDataKind == "compile-report")
+            params.getStatus match {
+              case bsp4j.StatusCode.OK => s"Compiled $projectName"
+              case bsp4j.StatusCode.ERROR => s"Error compiling $projectName"
+              case bsp4j.StatusCode.CANCELLED => s"Compilation cancelled$projectNameSuffix"
+              case _ => s"Compiled $projectName" // ???
+            }
+          else msg
+        out.println(gray + msg0 + reset)
+      }
   }
 
   override def onConnectWithServer(server: bsp4j.BuildServer): Unit = {}

modules/build/src/main/scala/scala/build/bsp/BspClient.scala

@@ -86,6 +86,7 @@ class BspClient(
     }
   }
 
+  def setProjectParams(newParams: Seq[String]): Unit = {}
   def diagnostics: Option[Seq[(Either[String, os.Path], b.Diagnostic)]] = None
   def clear(): Unit = {}
 }

modules/build/src/main/scala/scala/build/bsp/BspImpl.scala

@@ -274,6 +274,8 @@ object BspImpl {
     def underlying = actualLocalClient
     def clear() = underlying.clear()
     def diagnostics = underlying.diagnostics
+    def setProjectParams(newParams: Seq[String]) =
+      underlying.setProjectParams(newParams)
     def setGeneratedSources(newGeneratedSources: Seq[GeneratedSource]) =
       underlying.setGeneratedSources(newGeneratedSources)
   }

modules/build/src/main/scala/scala/build/options/BuildOptions.scala

@@ -30,6 +30,14 @@ final case class BuildOptions(
                  replOptions: ReplOptions                 = ReplOptions()
 ) {
 
+  lazy val projectParams: Seq[String] = {
+    val platform =
+      if (scalaJsOptions.enable) "Scala.JS"
+      else if (scalaNativeOptions.enable) "Scala Native"
+      else "JVM"
+    Seq(s"Scala ${scalaParams.scalaVersion}", platform)
+  }
+
   def addRunnerDependency: Option[Boolean] =
     internalDependencies.addRunnerDependencyOpt
       .orElse(if (scalaJsOptions.enable || scalaNativeOptions.enable) Some(false) else None)