bugfix: Use the default CompileReport

frontend/src/main/scala/bloop/logging/BspServerLogger.scala

@@ -8,7 +8,6 @@ import scala.collection.JavaConverters._
 import ch.epfl.scala.bsp
 import ch.epfl.scala.bsp.BuildTargetIdentifier
 import ch.epfl.scala.bsp.DiagnosticSeverity
-import ch.epfl.scala.bsp.Uri
 import ch.epfl.scala.bsp.endpoints.Build
 
 import bloop.bsp.BloopLanguageClient
@@ -349,16 +348,13 @@ final class BspServerLogger private (
     val errors = event.problems.count(_.severity == Severity.Error)
     val warnings = event.problems.count(_.severity == Severity.Warn)
     val encoded = writeToArray(
-      BspServerLogger.BloopCompileReport(
+      bsp.CompileReport(
         bsp.BuildTargetIdentifier(event.projectUri),
         originId,
         errors,
         warnings,
         None,
-        Some(event.isNoOp),
-        Some(event.isLastCycle),
-        event.clientDir.map(path => bsp.Uri(path.toBspUri)),
-        event.analysisOut.map(path => bsp.Uri(path.toBspUri))
+        Some(event.isNoOp)
       )
     )
 
@@ -390,27 +386,4 @@ object BspServerLogger {
     new BspServerLogger(name, state.logger, client, taskIdCounter, ansiCodesSupported, None)
   }
 
-  /**
-   * A modified version of `bsp.CompileReport` with optional bloop fields.
-   *
-   * We should consider upstreaming many of these fields as they are usually
-   * very useful for clients.
-   */
-  final case class BloopCompileReport(
-      target: BuildTargetIdentifier,
-      originId: Option[String],
-      errors: Int,
-      warnings: Int,
-      time: Option[Long],
-      // ++ bloop ++
-      isNoOp: Option[Boolean],
-      isLastCycle: Option[Boolean],
-      clientDir: Option[Uri],
-      analysisOut: Option[Uri]
-  )
-
-  object BloopCompileReport {
-    implicit val codec: JsonValueCodec[BloopCompileReport] =
-      JsonCodecMaker.makeWithRequiredCollectionFields
-  }
 }

frontend/src/main/scala/bloop/reporter/BspProjectReporter.scala

@@ -14,7 +14,6 @@ import bloop.logging.CompilationEvent
 
 import monix.execution.atomic.AtomicInt
 import xsbti.VirtualFile
-import bloop.UniqueCompileInputs
 import bloop.util.HashedSource
 
 final class BspProjectReporter(

frontend/src/test/scala/bloop/DeduplicationSpec.scala

@@ -115,7 +115,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> Msg: Compiling user (2 Scala sources)
             |  -> Data kind: compile-task
             |#1: task finish 1
-            |  -> errors 0, warnings 0
+            |  -> errors 0, warnings 0, noop false
             |  -> Msg: Compiled 'user'
             |  -> Data kind: compile-report
         """.stripMargin
@@ -230,7 +230,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> Msg: Compiling user (2 Scala sources)
             |  -> Data kind: compile-task
             |#1: task finish 1
-            |  -> errors 0, warnings 0
+            |  -> errors 0, warnings 0, noop false
             |  -> Msg: Compiled 'user'
             |  -> Data kind: compile-report
         """.stripMargin
@@ -323,7 +323,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> Msg: Compiling user (1 Scala source)
             |  -> Data kind: compile-task
             |#2: task finish 2
-            |  -> errors 0, warnings 0
+            |  -> errors 0, warnings 0, noop false
             |  -> Msg: Compiled 'user'
             |  -> Data kind: compile-report
         """.stripMargin
@@ -409,7 +409,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> Msg: Compiling user (2 Scala sources)
             |  -> Data kind: compile-task
             |#1: task finish 1
-            |  -> errors 0, warnings 0
+            |  -> errors 0, warnings 0, noop false
             |  -> Msg: Compiled 'user'
             |  -> Data kind: compile-report
         """.stripMargin
@@ -563,7 +563,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> List(Diagnostic(Range(Position(2,28),Position(2,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#1: task finish 1
-            |  -> errors 1, warnings 0
+            |  -> errors 1, warnings 0, noop false
             |  -> Msg: Compiled 'b'
             |  -> Data kind: compile-report
         """.stripMargin
@@ -644,7 +644,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> List(Diagnostic(Range(Position(2,28),Position(2,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#2: task finish 2
-            |  -> errors 1, warnings 0
+            |  -> errors 1, warnings 0, noop false
             |  -> Msg: Compiled 'b'
             |  -> Data kind: compile-report
         """.stripMargin
@@ -744,7 +744,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> List()
             |  -> reset = true
             |#3: task finish 3
-            |  -> errors 0, warnings 0
+            |  -> errors 0, warnings 0, noop false
             |  -> Msg: Compiled 'b'
             |  -> Data kind: compile-report
         """.stripMargin
@@ -891,7 +891,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
                |  -> Msg: Compiling b (6 Scala sources)
                |  -> Data kind: compile-task
                |#1: task finish 1
-               |  -> errors 0, warnings 0
+               |  -> errors 0, warnings 0, noop false
                |  -> Msg: Compiled 'b'
                |  -> Data kind: compile-report
            """.stripMargin
@@ -1093,7 +1093,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> Msg: Compiling user (32 Scala sources)
             |  -> Data kind: compile-task
             |#1: task finish 2
-            |  -> errors 0, warnings 0
+            |  -> errors 0, warnings 0, noop false
             |  -> Msg: Compiled 'user'
             |  -> Data kind: compile-report
         """.stripMargin

frontend/src/test/scala/bloop/bsp/BspClientTest.scala

@@ -300,7 +300,9 @@ trait BspClientTest {
                 (builder: StringBuilder) => {
                   builder.synchronized {
                     builder.++=(s"#${compileIteration()}: task finish ${taskFinish.taskId.id}\n")
-                    builder.++=(s"  -> errors ${report.errors}, warnings ${report.warnings}\n")
+                    builder.++=(
+                      s"  -> errors ${report.errors}, warnings ${report.warnings}, noop ${report.noOp.getOrElse(false)}\n"
+                    )
                     report.originId.foreach(originId => builder.++=(s"  -> origin = $originId\n"))
                     taskFinish.message.foreach(msg => builder.++=(s"  -> Msg: ${msg}\n"))
                     taskFinish.dataKind.foreach(msg => builder.++=(s"  -> Data kind: ${msg}\n"))