add bleep list-tests <...projects> command (#387)

also continue with warning if BSP wanted to test/compile a non-existing project
oyvindberg · Jun 16, 2024 · 37b3069 · 37b3069
1 parent 37bb98e
commit 37b3069
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 10 deletions.
diff --git a/bleep-cli/src/scala/bleep/Main.scala b/bleep-cli/src/scala/bleep/Main.scala
@@ -176,6 +176,11 @@ object Main {
               commands.Test(watch, projectNames)
             }
           ),
+          Opts.subcommand("list-tests", "list tests in projects")(
+            testProjectNames.map { projectNames =>
+              commands.ListTests(projectNames)
+            }
+          ),
           Opts.subcommand("run", "run project")(
             (
               projectName,

diff --git a/bleep-core/src/scala/bleep/BleepCommandRemote.scala b/bleep-core/src/scala/bleep/BleepCommandRemote.scala
@@ -2,13 +2,12 @@ package bleep
 
 import bleep.bsp.{BleepRifleLogger, BspCommandFailed, SetupBloopRifle}
 import bleep.internal.{BspClientDisplayProgress, Throwables, TransitiveProjects}
+import bloop.rifle.internal.Operations
+import bloop.rifle.*
 import ch.epfl.scala.bsp4j
 
 import java.nio.file.Files
 import java.util
-import bloop.rifle.{BloopServer, BloopThreads, BuildServer}
-import bloop.rifle.internal.Operations
-import bloop.rifle.{BloopRifleConfig, FailedToStartServerException}
 import scala.util.Try
 
 abstract class BleepCommandRemote(watch: Boolean) extends BleepBuildCommand {
@@ -102,7 +101,7 @@ abstract class BleepCommandRemote(watch: Boolean) extends BleepBuildCommand {
           res <- buildClient.failed match {
             case empty if empty.isEmpty => Right(())
             case failed =>
-              val projects = failed.map(BleepCommandRemote.projectFromBuildTarget(started)).toArray
+              val projects = failed.flatMap(BleepCommandRemote.projectFromBuildTarget(started)).toArray
               Left(new BspCommandFailed("Failed", projects, BspCommandFailed.NoDetails))
           }
         } yield res
@@ -111,7 +110,9 @@ abstract class BleepCommandRemote(watch: Boolean) extends BleepBuildCommand {
       started.config.compileServerModeOrDefault match {
         case model.CompileServerMode.NewEachInvocation =>
           server.shutdown()
-          Operations.exit(bloopRifleConfig.address, started.buildPaths.dotBleepDir, System.out, System.err, bleepRifleLogger)
+          if (Operations.exit(bloopRifleConfig.address, started.buildPaths.dotBleepDir, System.out, System.err, bleepRifleLogger) != 0) {
+            started.logger.warn("Failed to shutdown the compile server")
+          }
           ()
         case model.CompileServerMode.Shared =>
           ()
@@ -138,10 +139,8 @@ object BleepCommandRemote {
     new bsp4j.BuildTargetIdentifier(amended)
   }
 
-  def projectFromBuildTarget(started: Started)(name: bsp4j.BuildTargetIdentifier): model.CrossProjectName = {
-    val id = name.getUri.split("=").last
-    started.build.explodedProjects.keys.find(_.value == id).getOrElse(sys.error(s"Couldn't find project for $name"))
-  }
+  def projectFromBuildTarget(started: Started)(name: bsp4j.BuildTargetIdentifier): Option[model.CrossProjectName] =
+    started.build.explodedProjects.keys.find(_.value == name.getUri.split("=").last)
 
   def buildTargets(buildPaths: BuildPaths, projects: Array[model.CrossProjectName]): util.List[bsp4j.BuildTargetIdentifier] =
     util.List.of(projects.map(p => buildTarget(buildPaths, p)): _*)

diff --git a/bleep-core/src/scala/bleep/bsp/BleepBspServer.scala b/bleep-core/src/scala/bleep/bsp/BleepBspServer.scala
@@ -166,7 +166,12 @@ class BleepBspServer(
         warn(s"bleep was not able to refresh the build", bleepException)
         CompletableFuture.completedFuture[CompileResult](new CompileResult(bsp4j.StatusCode.ERROR))
       case Right(started) =>
-        val projects = params.getTargets.asScala.toArray.map(BleepCommandRemote.projectFromBuildTarget(started))
+        val projects = params.getTargets.asScala.toArray.flatMap { target =>
+          BleepCommandRemote.projectFromBuildTarget(started)(target).orElse {
+            logger.warn(s"Couldn't find project for target ${target.getUri}. Bleep may have picked up a change you IDE hasn't. Try to reload the build.")
+            None
+          }
+        }
 
         DoSourceGen(started, bloopServer, TransitiveProjects(started.build, projects)) match {
           case Left(bleepException) =>

diff --git a/bleep-core/src/scala/bleep/commands/ListTests.scala b/bleep-core/src/scala/bleep/commands/ListTests.scala
@@ -0,0 +1,37 @@
+package bleep
+package commands
+
+import bleep.internal.TransitiveProjects
+import bloop.rifle.BuildServer
+import ch.epfl.scala.bsp4j
+import ch.epfl.scala.bsp4j.ScalaTestClassesParams
+
+import scala.jdk.CollectionConverters.*
+
+case class ListTests(projects: Array[model.CrossProjectName]) extends BleepCommandRemote(watch = false) {
+
+  override def watchableProjects(started: Started): TransitiveProjects =
+    TransitiveProjects(started.build, projects)
+
+  override def runWithServer(started: Started, bloop: BuildServer): Either[BleepException, Unit] = {
+    val all: Iterator[(model.CrossProjectName, String)] = testsByCrossProject(started, bloop)
+
+    all.toList.groupBy { case (pn, cls) => pn.name }.foreach { case (pn, tuples) =>
+      started.logger.info(s"${pn.value}:")
+      tuples.foreach { case (_, cls) => started.logger.info(s"  $cls") }
+    }
+
+    Right(())
+  }
+
+  private def testsByCrossProject(started: Started, bloop: BuildServer): Iterator[(model.CrossProjectName, String)] = {
+    val targets = BleepCommandRemote.buildTargets(started.buildPaths, projects)
+    val result = bloop.buildTargetScalaTestClasses(new ScalaTestClassesParams(targets)).get()
+
+    for {
+      item <- result.getItems.iterator().asScala
+      projectName <- BleepCommandRemote.projectFromBuildTarget(started)(item.getTarget).iterator
+      cls <- item.getClasses.iterator.asScala
+    } yield (projectName, cls)
+  }
+}