Merge commit '72f9449ac'

Author: alexarchambault

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

@@ -310,7 +310,7 @@ final class BloopBspServices(
               compileProvider = Some(BloopBspServices.DefaultCompileProvider),
               testProvider = Some(BloopBspServices.DefaultTestProvider),
               runProvider = Some(BloopBspServices.DefaultRunProvider),
-              debugProvider = None, // todo kpodsiad
+              debugProvider = Some(BloopBspServices.DefaultDebugProvider),
               inverseSourcesProvider = Some(true),
               dependencySourcesProvider = Some(true),
               dependencyModulesProvider = None,
@@ -1041,7 +1041,8 @@ final class BloopBspServices(
               val capabilities = bsp.BuildTargetCapabilities(
                 canCompile = true,
                 canTest = true,
-                canRun = true
+                canRun = true,
+                canDebug = true
               )
               val isJavaOnly = p.scalaInstance.isEmpty
               val languageIds =
@@ -1344,4 +1345,5 @@ object BloopBspServices {
   private[bloop] val DefaultCompileProvider = bsp.CompileProvider(DefaultLanguages)
   private[bloop] val DefaultTestProvider = bsp.TestProvider(DefaultLanguages)
   private[bloop] val DefaultRunProvider = bsp.RunProvider(DefaultLanguages)
+  private[bloop] val DefaultDebugProvider = bsp.DebugProvider(DefaultLanguages)
 }

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

@@ -37,7 +37,7 @@ class BspCompileSpec(
     // 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: ${TestConstants.buildInitialize}
           |  --> 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"}

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

@@ -4,7 +4,6 @@ import scala.concurrent.duration.FiniteDuration
 
 import bloop.cli.BspProtocol
 import bloop.cli.ExitStatus
-import bloop.internal.build.BuildInfo
 import bloop.io.Environment.lineSeparator
 import bloop.logging.BspClientLogger
 import bloop.logging.RecordingLogger
@@ -103,7 +102,7 @@ class BspConnectionSpec(
     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: ${TestConstants.buildInitialize}
           |  --> content: {"method":"build/initialized","params":{},"jsonrpc":"2.0"}""".stripMargin
     )
   }

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

@@ -0,0 +1,30 @@
+package bloop.bsp
+
+import bloop.internal.build.BuildInfo
+
+object TestConstants {
+  val buildInitialize: String = raw"""
+  {
+    "result": {
+      "displayName": "${BuildInfo.bloopName}",
+      "version": "${BuildInfo.version}",
+      "bspVersion": "${BuildInfo.bspVersion}",
+      "capabilities": {
+        "compileProvider": { "languageIds": ["scala", "java"] },
+        "testProvider": { "languageIds": ["scala", "java"] },
+        "runProvider": { "languageIds": ["scala", "java"] },
+        "debugProvider": { "languageIds": ["scala", "java"] },
+        "inverseSourcesProvider": true,
+        "dependencySourcesProvider": true,
+        "resourcesProvider": true,
+        "buildTargetChangedProvider": false,
+        "jvmTestEnvironmentProvider": true,
+        "jvmRunEnvironmentProvider": true,
+        "canReload": false
+      }
+    },
+    "id": 2,
+    "jsonrpc": "2.0"
+  }
+  """.replaceAll("\\s", "")
+}

project/Dependencies.scala

@@ -7,7 +7,7 @@ object Dependencies {
   // Keep in sync in BloopComponentCompiler
   val zincVersion = "1.6.0"
 
-  val bspVersion = "2.0.0-M15"
+  val bspVersion = "2.1.0-M1"
   val javaDebugVersion = "0.21.0+1-7f1080f1"
 
   val scalazVersion = "7.2.20"