review minor fixes

Author: dos65

backend/src/main/scala/bloop/task/Task.scala

@@ -21,7 +21,7 @@ import monix.execution.Callback
  * This task was introduced as a compatibilty layer to ublock bloop migration from monix2.
  *  there is an important difference between monix2 and monix3  in cancellation mechanic:
  *  - monix2 - cancel is a signal that triggers `doOnCancel` callbacks and the whole task anyway completes.
- *  - monix3 - cancel actually cancel the runLoop of task and turns `CancellableFuture` into icomletable one.
+ *  - monix3 - cancel actually cancel the runLoop of task and turns `CancellableFuture` into incomletable one.
  *
  * Bloop is hugely relies on `doOnCancel` usage and old cancellation mechanic.
  * Actually, most of bsp-methods are kind of function `(Input, State) => State`.
@@ -607,8 +607,7 @@ object Task {
   }
 
   def sleep(duration: FiniteDuration): Task[Unit] =
-    //Wrap(MonixTask.sleep(duration), List.empty)
-    Wrap(MonixTask.unit.delayExecution(duration), List.empty)
+    Wrap(MonixTask.sleep(duration), List.empty)
 
   def fromTry[A](v: Try[A]): Task[A] =
     v match {

frontend/src/main/scala/bloop/bsp/BloopBspServices.scala

@@ -77,6 +77,7 @@ import monix.execution.Scheduler
 import monix.execution.atomic.AtomicBoolean
 import monix.execution.atomic.AtomicInt
 import monix.reactive.subjects.BehaviorSubject
+import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
 
 final class BloopBspServices(
     callSiteState: State,
@@ -620,7 +621,7 @@ final class BloopBspServices(
             BloopDebuggeeRunner.forMainClass(projects, main, state, ioScheduler)
           )
         case bsp.DebugSessionParamsDataKind.ScalaTestSuites =>
-          import bloop.util.jsoniter.JsoniterCodecs._
+          implicit val codec = JsonCodecMaker.make[List[String]]
           convert[List[String]](classNames => {
             val testClasses = ScalaTestSuites(classNames)
             BloopDebuggeeRunner.forTestSuite(projects, testClasses, state, ioScheduler)

frontend/src/main/scala/bloop/bsp/BloopRpcServices.scala

@@ -11,8 +11,8 @@ import scribe.LoggerSupport
 import BloopRpcServices.BloopEndpoint
 
 /**
- * This is the similar thing as `jsonrpc4s.Services` that is udea to describe a groupd of JSON-RPC ednpoints.
- * Introduced in oder to operate over `bloop.task.Task` instead of `monix.eval.Task`
+ * This is the similar thing as `jsonrpc4s.Services` that is used to describe a group of JSON-RPC endpoints.
+ * Introduced in order to operate over `bloop.task.Task` instead of `monix.eval.Task`
  */
 case class BloopRpcServices(endpoints: List[BloopEndpoint], loggerSupport: LoggerSupport) {
   def requestAsync[A, B](endpoint: Endpoint[A, B])(

frontend/src/main/scala/bloop/util/jsoniter/JsoniterCodecs.scala

@@ -351,14 +351,4 @@ trait BspClientTest {
       }
   }
 
-  //TODO??
-  sealed trait BspClientAction
-  object BspClientAction {
-    case object CompileEmpty extends BspClientAction // Required to check errors when sending no tid
-    case class Compile(target: bsp.BuildTargetIdentifier) extends BspClientAction
-    case class CreateFile(path: AbsolutePath, contents: String) extends BspClientAction
-    case class DeleteFile(path: AbsolutePath) extends BspClientAction
-    case class OverwriteFile(path: AbsolutePath, contents: String) extends BspClientAction
-  }
-
 }

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

@@ -34,18 +34,14 @@ class BspCompileSpec(
     }
     val contentLogs = logger.debugs.flatMap(_.split("\n")).filter(_.startsWith("  --> content:"))
     val allButInitializeRequest = contentLogs.filterNot(_.contains("""build/initialize""""))
-    // some IDEs might trim spaces in multiline string
-    val spaces = "       "
     // Filter out the initialize request that contains platform-specific details
     assertNoDiff(
       allButInitializeRequest.mkString(lineSeparator),
-      s"""|
-          |  --> content: {"result":{"displayName":"${BuildInfo.bloopName}","version":"${BuildInfo.version}","bspVersion":"${BuildInfo.bspVersion}","capabilities":{"compileProvider":{"languageIds":["scala","java"]},"testProvider":{"languageIds":["scala","java"]},"runProvider":{"languageIds":["scala","java"]},"inverseSourcesProvider":true,"dependencySourcesProvider":true,"resourcesProvider":true,"buildTargetChangedProvider":false,"jvmTestEnvironmentProvider":true,"jvmRunEnvironmentProvider":true,"canReload":false}},"id":2,"jsonrpc":"2.0"}
+      s"""|  --> content: {"result":{"displayName":"${BuildInfo.bloopName}","version":"${BuildInfo.version}","bspVersion":"${BuildInfo.bspVersion}","capabilities":{"compileProvider":{"languageIds":["scala","java"]},"testProvider":{"languageIds":["scala","java"]},"runProvider":{"languageIds":["scala","java"]},"inverseSourcesProvider":true,"dependencySourcesProvider":true,"resourcesProvider":true,"buildTargetChangedProvider":false,"jvmTestEnvironmentProvider":true,"jvmRunEnvironmentProvider":true,"canReload":false}},"id":2,"jsonrpc":"2.0"}
           |  --> content: {"method":"build/initialized","params":{},"jsonrpc":"2.0"}
           |  --> content: {"method":"build/shutdown","params":{},"id":3,"jsonrpc":"2.0"}
           |  --> content: {"result":{},"id":3,"jsonrpc":"2.0"}
-          |  --> content: {"method":"build/exit","params":{},"jsonrpc":"2.0"}
-          |$spaces""".stripMargin
+          |  --> content: {"method":"build/exit","params":{},"jsonrpc":"2.0"}""".stripMargin
     )
   }
 

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

@@ -92,14 +92,11 @@ class BspConnectionSpec(
     val contentLogs = logger.debugs.flatMap(_.split("\n")).filter(_.startsWith("  --> content:"))
     // Filter out the initialize request that contains platform-specific details
     val allButInitializeRequest = contentLogs.filterNot(_.contains("""build/initialize""""))
-    // some IDEs might trim spaces in multiline string
-    val spaces = "       "
     assertNoDiff(
       allButInitializeRequest.mkString(lineSeparator),
       s"""|
           |  --> content: {"result":{"displayName":"${BuildInfo.bloopName}","version":"${BuildInfo.version}","bspVersion":"${BuildInfo.bspVersion}","capabilities":{"compileProvider":{"languageIds":["scala","java"]},"testProvider":{"languageIds":["scala","java"]},"runProvider":{"languageIds":["scala","java"]},"inverseSourcesProvider":true,"dependencySourcesProvider":true,"resourcesProvider":true,"buildTargetChangedProvider":false,"jvmTestEnvironmentProvider":true,"jvmRunEnvironmentProvider":true,"canReload":false}},"id":2,"jsonrpc":"2.0"}
-          |  --> content: {"method":"build/initialized","params":{},"jsonrpc":"2.0"}
-          |$spaces""".stripMargin
+          |  --> content: {"method":"build/initialized","params":{},"jsonrpc":"2.0"}""".stripMargin
     )
   }
 

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

@@ -12,6 +12,7 @@ import bloop.util.TestUtil
 
 import com.github.plokhotnyuk.jsoniter_scala.core._
 import jsonrpc4s.RawJson
+import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
 
 object DebugProtocolSpec extends DebugBspBaseSuite {
   test("starts a debug session") {
@@ -183,8 +184,8 @@ object DebugProtocolSpec extends DebugBspBaseSuite {
   def testSuiteParams(
       filters: List[String]
   ): bsp.BuildTargetIdentifier => bsp.DebugSessionParams = { target =>
-    import bloop.util.jsoniter.JsoniterCodecs._
     val targets = List(target)
+    implicit val codec = JsonCodecMaker.make[List[String]]
     val json = writeToArray[List[String]](filters)
     bsp.DebugSessionParams(targets, ScalaTestSuites, RawJson(json))
   }

frontend/src/test/scala/bloop/dap/DebugProtocolSpec.scala

@@ -303,17 +303,17 @@ final class BspBridge(
 object BspBridge {
 
   class LogsRecordingStream(
-    maxLines: Int,
-    mkString: StringBuilder => String
+      maxLines: Int,
+      mkString: StringBuilder => String
   ) extends OutputStream {
-    val queue =  scala.collection.mutable.Queue.empty[String]
+    val queue = scala.collection.mutable.Queue.empty[String]
     var currLine = new StringBuilder()
     def write(b: Int): Unit = {
       synchronized {
-        if (b == '\n'){
+        if (b == '\n') {
           if (queue.length == maxLines)
             queue.dequeue()
-          
+
           queue.enqueue(mkString(currLine))
           currLine = new StringBuilder()
         } else {
@@ -332,20 +332,19 @@ object BspBridge {
   }
 
   object LogsRecordingStream {
-    def apply(maxLines: Int): LogsRecordingStream =  {
-      val mkString = 
+    def apply(maxLines: Int): LogsRecordingStream = {
+      val mkString =
         if (scala.util.Properties.isWin)
-          (b: StringBuilder) => { 
-              if (b.last == '\r')
-                b.deleteCharAt(b.length - 1)
-              b.toString
+          (b: StringBuilder) => {
+            if (b.last == '\r')
+              b.deleteCharAt(b.length - 1)
+            b.toString
           }
         else
           (b: StringBuilder) => b.toString()
       new LogsRecordingStream(maxLines, mkString)
     }
 
   }
-  
 
 }