Merge pull request #2083 from tgodzik/update-bsp

improvement: Add main classes to JvmEnvironmentItem
scalacenter · Jun 26, 2023 · 75d7329 · 75d7329
2 parents 54d76cf + 667ef2d
commit 75d7329
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/frontend/src/main/scala/bloop/bsp/BloopBspServices.scala b/frontend/src/main/scala/bloop/bsp/BloopBspServices.scala
@@ -782,13 +782,15 @@ final class BloopBspServices(
             environmentVariables = state.commonOptions.env.toMap
             workingDirectory = project.workingDirectory.toString
             javaOptions <- project.runtimeJdkConfig.map(_.javaOptions.toList)
+            classNames = Tasks.findMainClasses(state, project)
           } yield {
             bsp.JvmEnvironmentItem(
               id,
               fullClasspath.toList,
               javaOptions,
               workingDirectory,
-              environmentVariables
+              environmentVariables,
+              Some(classNames.map(bsp.JvmMainClass(_, Nil)))
             )
           }).toList
           Task.now((state, Right(environmentEntries)))

diff --git a/frontend/src/test/scala/bloop/bsp/BspProtocolSpec.scala b/frontend/src/test/scala/bloop/bsp/BspProtocolSpec.scala
@@ -118,7 +118,9 @@ class BspProtocolSpec(
     object Sources {
       val `A.scala` =
         """/A.scala
-          |object A
+          |object A {
+          |  def main(args: Array[String]): Unit = ???
+          |}
           """.stripMargin
     }
 
@@ -129,6 +131,7 @@ class BspProtocolSpec(
     val jvmConfig = Some(Config.JvmConfig(None, jvmOptions))
     val runtimeJvmOptions = List("-DOTHER_OPTION=Y") ++ workingDirectoryOption
     val runtimeJvmConfig = Some(Config.JvmConfig(None, runtimeJvmOptions))
+    val runtimeMainClasses = Some(List(bsp.JvmMainClass("A", Nil)))
     val `A` = TestProject(
       workspace,
       "a",
@@ -140,8 +143,9 @@ class BspProtocolSpec(
     val projects = List(`A`)
 
     loadBspState(workspace, projects, logger) { state =>
+      val compileState = state.compile(`A`)
       val (stateA: ManagedBspTestState, environmentItems: List[JvmEnvironmentItem]) =
-        extractor(state, `A`)
+        extractor(compileState, `A`)
       assert(environmentItems.size == 1)
       assert(stateA.status == ExitStatus.Ok)
 
@@ -164,10 +168,11 @@ class BspProtocolSpec(
       )
 
       assert(environmentItem.jvmOptions == runtimeJvmOptions)
+      assert(environmentItem.mainClasses == runtimeMainClasses)
     }
   }
 
-  test("check the correct contents of jvm test environment") {
+  test("check-jvm-test-environment") {
     TestUtil.withinWorkspace { workspace =>
       testEnvironmentFetching(
         workspace,
@@ -180,7 +185,7 @@ class BspProtocolSpec(
     }
   }
 
-  test("check the correct contents of jvm run environment") {
+  test("check-jvm-main-environment") {
     TestUtil.withinWorkspace { workspace =>
       testEnvironmentFetching(
         workspace,

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -18,7 +18,7 @@ object Dependencies {
   // Keep in sync in BloopComponentCompiler
   val zincVersion = "1.8.1"
 
-  val bspVersion = "2.1.0-M3"
+  val bspVersion = "2.1.0-M5"
 
   val scalazVersion = "7.3.7"
   val lmVersion = "1.9.0"