scalacenter · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.6"
+version = "3.7.10"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk

diff --git a/backend/src/main/scala/bloop/BloopClassFileManager.scala b/backend/src/main/scala/bloop/BloopClassFileManager.scala
@@ -221,7 +221,8 @@ final class BloopClassFileManager(
                 newClassesDir,
                 clientExternalClassesDir.underlying,
                 inputs.ioScheduler,
-                enableCancellation = false
+                enableCancellation = false,
+                inputs.logger
               )
               .map { walked =>
                 readOnlyCopyDenylist.++=(walked.target)
@@ -279,7 +280,8 @@ final class BloopClassFileManager(
                     Paths.get(readOnlyClassesDirPath),
                     clientExternalClassesDir.underlying,
                     inputs.ioScheduler,
-                    enableCancellation = false
+                    enableCancellation = false,
+                    inputs.logger
                   )
                   .map(_ => ())
               }

diff --git a/backend/src/main/scala/bloop/Compiler.scala b/backend/src/main/scala/bloop/Compiler.scala
@@ -434,7 +434,8 @@ object Compiler {
                   readOnlyClassesDir,
                   clientClassesDir.underlying,
                   compileInputs.ioScheduler,
-                  enableCancellation = false
+                  enableCancellation = false,
+                  compileInputs.logger
                 )
 
                 lastCopy.map { _ =>

diff --git a/backend/src/main/scala/bloop/io/ParallelOps.scala b/backend/src/main/scala/bloop/io/ParallelOps.scala
@@ -22,6 +22,8 @@ import monix.execution.cancelables.CompositeCancelable
 import monix.reactive.Consumer
 import monix.reactive.MulticastStrategy
 import monix.reactive.Observable
+import bloop.logging.Logger
+import scala.util.control.NonFatal
 
 object ParallelOps {
 
@@ -67,7 +69,8 @@ object ParallelOps {
       origin: Path,
       target: Path,
       scheduler: Scheduler,
-      enableCancellation: Boolean
+      enableCancellation: Boolean,
+      logger: Logger
   ): Task[FileWalk] = Task.defer {
     val isCancelled = AtomicBoolean(false)
 
@@ -152,7 +155,7 @@ object ParallelOps {
 
     val copyFileSequentially = Consumer.foreachTask[((Path, BasicFileAttributes), Path)] {
       case ((originFile, originAttrs), targetFile) =>
-        def copy(replaceExisting: Boolean): Unit = {
+        def copy(replaceExisting: Boolean): Unit = try {
           if (replaceExisting) {
             Files.copy(
               originFile,
@@ -168,6 +171,12 @@ object ParallelOps {
             )
           }
           ()
+        } catch {
+          case NonFatal(t) =>
+            logger.report(
+              s"Unexpected error when copying $originFile to $targetFile, you might need to restart the build server.",
+              t
+            )
         }
 
         // It's important that this task is not forked for performance reasons

diff --git a/backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopHighLevelCompiler.scala b/backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopHighLevelCompiler.scala
@@ -137,6 +137,10 @@ final class BloopHighLevelCompiler(
               val msg = "Encountered a StackOverflowError coming from the compiler. You might need to restart your Bloop build server"
               logger.error(s"${msg}:\n${t.getStackTrace().mkString("\n")}")
               throw new CompileFailed(new Array(0), msg, new Array(0), t)
+            case t: NoClassDefFoundError =>
+              val msg = "Encountered a NoClassDefFoundError coming from the compiler. You might need to clean compile your workspace"
+              logger.error(s"${msg}:\n${t.getStackTrace().mkString("\n")}")
+              throw new CompileFailed(new Array(0), msg, new Array(0), t)
             case NonFatal(t) =>
               // If scala compilation happens, complete the java promise so that it doesn't block
               JavaCompleted.tryFailure(t)

diff --git a/bin/scalafmt b/bin/scalafmt
diff --git a/bridges/scalajs-1/src/main/scala/bloop/scalajs/JsBridge.scala b/bridges/scalajs-1/src/main/scala/bloop/scalajs/JsBridge.scala
@@ -147,25 +147,32 @@ object JsBridge {
       env: Map[String, String]
   ): (List[sbt.testing.Framework], () => Unit) = {
     implicit val debugFilter: DebugFilter = DebugFilter.Test
-    val nodeModules = baseDirectory.resolve("node_modules").toString
-    logger.debug("Node.js module path: " + nodeModules)
-    val fullEnv = Map("NODE_PATH" -> nodeModules) ++ env
-    val config =
-      NodeJSConfig().withExecutable(nodePath).withCwd(Some(baseDirectory)).withEnv(fullEnv)
-    val nodeEnv =
-      if (!jsConfig.jsdom.contains(true)) new NodeJSEnv(logger, config)
-      else new JsDomNodeJsEnv(logger, config)
-
-    // The order of the scripts mandates the load order in the JavaScript runtime
-    val input = jsConfig.kind match {
-      case ModuleKindJS.NoModule => Input.Script(jsPath)
-      case ModuleKindJS.CommonJSModule => Input.CommonJSModule(jsPath)
-      case ModuleKindJS.ESModule => Input.ESModule(jsPath)
-    }
+    val nodeModules = baseDirectory.resolve("node_modules")
+    if (nodeModules.toFile().exists()) {
+      logger.debug("Node.js module path: " + nodeModules.toString())
+      val fullEnv = Map("NODE_PATH" -> nodeModules.toString()) ++ env
+      val config =
+        NodeJSConfig().withExecutable(nodePath).withCwd(Some(baseDirectory)).withEnv(fullEnv)
+      val nodeEnv =
+        if (!jsConfig.jsdom.contains(true)) new NodeJSEnv(logger, config)
+        else new JsDomNodeJsEnv(logger, config)
+
+      // The order of the scripts mandates the load order in the JavaScript runtime
+      val input = jsConfig.kind match {
+        case ModuleKindJS.NoModule => Input.Script(jsPath)
+        case ModuleKindJS.CommonJSModule => Input.CommonJSModule(jsPath)
+        case ModuleKindJS.ESModule => Input.ESModule(jsPath)
+      }
 
-    val testConfig = TestAdapter.Config().withLogger(new Logger(logger))
-    val adapter = new TestAdapter(nodeEnv, Seq(input), testConfig)
-    val result = adapter.loadFrameworks(frameworkNames).flatMap(_.toList)
-    (result, () => adapter.close())
+      val testConfig = TestAdapter.Config().withLogger(new Logger(logger))
+      val adapter = new TestAdapter(nodeEnv, Seq(input), testConfig)
+      val result = adapter.loadFrameworks(frameworkNames).flatMap(_.toList)
+      (result, () => adapter.close())
+    } else {
+      logger.error(
+        s"Cannot discover test frameworks, missing node_modules in test project, expected them at $nodeModules"
+      )
+      (Nil, () => ())
+    }
   }
 }
diff --git a/bridges/scalajs-1/src/main/scala/bloop/scalajs/jsenv/NodeJsEnv.scala b/bridges/scalajs-1/src/main/scala/bloop/scalajs/jsenv/NodeJsEnv.scala
@@ -124,6 +124,7 @@ final class NodeJSEnv(logger: Logger, config: NodeJSConfig) extends JSEnv {
   }
 
   private def internalStart(input: Seq[Input], runConfig: RunConfig): JSRun = {
+    runConfig.logger.debug("Using input file: " + (input.mkString(",")))
     NodeJSEnv.internalStart(logger, config, env)(NodeJSEnv.write(input), runConfig)
   }
 
@@ -290,7 +291,10 @@ object NodeJSEnv {
       import scala.concurrent.ExecutionContext.Implicits.global
 
       private val isClosed = AtomicBoolean(false)
-      override def future: Future[Unit] = cancellable.map(_ => ())
+      override def future: Future[Unit] = cancellable.map { results =>
+        logger.debug(s"Finished with results: ${results}")
+        ()
+      }
       override def close(): Unit = {
         // Make sure we only destroy the process once, the test adapter can call this several times!
         if (!isClosed.getAndSet(true)) {

diff --git a/bridges/scalajs-1/src/test/scala/bloop/scalajs/ScalaJsToolchainSpec.scala b/bridges/scalajs-1/src/test/scala/bloop/scalajs/ScalaJsToolchainSpec.scala
@@ -69,7 +69,7 @@ class ScalaJsToolchainSpec {
     logger.getMessages.assertContain("Hello, world!", atLevel = "info")
   }
 
-  private final val maxDuration = Duration.apply(45, TimeUnit.SECONDS)
+  private final val maxDuration = Duration.apply(60, TimeUnit.SECONDS)
   private implicit class RichLogs(logs: List[(String, String)]) {
     def assertContain(needle: String, atLevel: String): Unit = {
       def failMessage: String =

diff --git a/frontend/src/main/scala/bloop/data/Project.scala b/frontend/src/main/scala/bloop/data/Project.scala
@@ -454,10 +454,10 @@ object Project {
       // engine so that semanticdb files are replicated in those directories
       val hasSemanticDB = hasScalaSemanticDBEnabledInCompilerOptions(options)
       val pluginOption = if (hasSemanticDB) Nil else List(s"-Xplugin:$pluginPath")
-      val baseOptions = s"-P:semanticdb:sourceroot:$workspaceDir" :: options.filterNot(
-        isScalaSemanticdbSourceRoot
+      val baseOptions = s"-P:semanticdb:sourceroot:$workspaceDir" :: options.filterNot(opt =>
+        isScalaSemanticdbSourceRoot(opt) || baseSemanticdbOptions.contains(opt)
       )
-      (baseOptions ++ baseSemanticdbOptions ++ pluginOption).distinct
+      baseOptions ++ baseSemanticdbOptions ++ pluginOption
     }
 
     def enableDottySemanticdb(options: List[String]) = {

diff --git a/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala b/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala
@@ -363,7 +363,8 @@ object CompileTask {
           products.readOnlyClassesDir,
           products.newClassesDir,
           ExecutionContext.ioScheduler,
-          enableCancellation = false
+          enableCancellation = false,
+          logger
         )
       }
 

diff --git a/frontend/src/main/scala/bloop/logging/BspServerLogger.scala b/frontend/src/main/scala/bloop/logging/BspServerLogger.scala
@@ -53,11 +53,32 @@ final class BspServerLogger private (
 
   override def ansiCodesSupported: Boolean = ansiSupported || underlying.ansiCodesSupported()
 
-  override private[logging] def printDebug(msg: String): Unit = underlying.printDebug(msg)
+  override private[logging] def printDebug(msg: String): Unit = {
+    if (isVerbose)
+      client.notify(
+        Build.logMessage,
+        bsp.LogMessageParams(bsp.MessageType.Log, None, originId, msg)
+      )
+    underlying.printDebug(msg)
+
+  }
   override def debug(msg: String)(implicit ctx: DebugFilter): Unit =
     if (debugFilter.isEnabledFor(ctx)) printDebug(msg)
 
-  override def trace(t: Throwable): Unit = underlying.trace(t)
+  override def trace(t: Throwable): Unit = {
+    if (isVerbose) {
+      def msg(t: Throwable): String = {
+        val base = t.getMessage() + "\n" + t.getStackTrace().mkString("\n\t")
+        if (t.getCause() == null) base
+        else base + "\nCaused by: " + msg(t.getCause())
+      }
+      client.notify(
+        Build.logMessage,
+        bsp.LogMessageParams(bsp.MessageType.Log, None, originId, msg(t))
+      )
+    }
+    underlying.trace(t)
+  }
 
   override def error(msg: String): Unit = {
     client.notify(

diff --git a/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties b/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.9.1
+sbt.version=1.9.2
 
diff --git a/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties b/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.9.1
+sbt.version=1.9.2
 
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.1
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.1
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.1
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/plugins.sbt b/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.1")
 
 val pluginVersion = sys.props.getOrElse(

diff --git a/frontend/src/test/resources/custom-test-framework/project/build.properties b/frontend/src/test/resources/custom-test-framework/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.1
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/no-test-frameworks/project/project/build.properties b/frontend/src/test/resources/no-test-frameworks/project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.1
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/scala-seed-project/project/build.properties b/frontend/src/test/resources/scala-seed-project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.1
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/simple-build/project/build.properties b/frontend/src/test/resources/simple-build/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.1
+sbt.version=1.9.2
diff --git a/frontend/src/test/scala/bloop/bsp/BspCompileSpec.scala b/frontend/src/test/scala/bloop/bsp/BspCompileSpec.scala
@@ -36,7 +36,9 @@ class BspCompileSpec(
         assertExitStatus(state, ExitStatus.Ok)
       }
     }
-    val contentLogs = logger.debugs.flatMap(_.split("\n")).filter(_.startsWith("  --> content:"))
+    val contentLogs = logger.debugs
+      .flatMap(_.split("\n"))
+      .filter(msg => msg.startsWith("  --> content:") && !msg.contains("logMessage"))
     val allButInitializeRequest = contentLogs.filterNot(_.contains("""build/initialize""""))
     // Filter out the initialize request that contains platform-specific details
     assertNoDiff(

diff --git a/frontend/src/test/scala/bloop/bsp/BspConnectionSpec.scala b/frontend/src/test/scala/bloop/bsp/BspConnectionSpec.scala
@@ -90,7 +90,9 @@ class BspConnectionSpec(
   def checkConnectionIsInitialized(logger: RecordingLogger): Unit = {
     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""""))
+    val allButInitializeRequest = contentLogs.filterNot(msg =>
+      msg.contains("""build/initialize"""") || msg.contains("logMessage")
+    )
     assertNoDiff(
       allButInitializeRequest.mkString(lineSeparator),
       s"""|

diff --git a/frontend/src/test/scala/bloop/bsp/BspMetalsClientSpec.scala b/frontend/src/test/scala/bloop/bsp/BspMetalsClientSpec.scala
@@ -167,7 +167,14 @@ class BspMetalsClientSpec(
         )
 
         val scalacOptions = state.scalaOptions(`A`)._2.items.head.options
-        assert(scalacOptions == correctSourceRootOption :: defaultScalacOptions.drop(1))
+        val expectedScalacOptions = correctSourceRootOption :: List(
+          "-Xplugin:path-to-plugin/semanticdb-scalac_2.12.18-4.7.8.jar",
+          "-Yrangepos",
+          "-P:semanticdb:failures:warning",
+          "-P:semanticdb:synthetics:on",
+          "-Xplugin-require:semanticdb"
+        )
+        assert(scalacOptions == expectedScalacOptions)
       }
     }
   }
@@ -469,6 +476,33 @@ class BspMetalsClientSpec(
     }
   }
 
+  test("save-compile-semanticDB-many-options") {
+    TestUtil.withinWorkspace { workspace =>
+      val `A` = TestProject(
+        workspace,
+        "A",
+        dummyFooScalaAndBarJavaSources,
+        scalacOptions = List("-release", "8", "-Ybackend-parallelism", "8")
+      )
+      val projects = List(`A`)
+      TestProject.populateWorkspace(workspace, projects)
+      val logger = new RecordingLogger(ansiCodesSupported = false)
+      val extraParams = BloopExtraBuildParams(
+        ownsBuildFiles = None,
+        clientClassesRootDir = None,
+        semanticdbVersion = Some(semanticdbVersion),
+        supportedScalaVersions = Some(List(testedScalaVersion)),
+        javaSemanticdbVersion = Some(javaSemanticdbVersion)
+      )
+      loadBspState(workspace, projects, logger, "Metals", bloopExtraParams = extraParams) { state =>
+        val compiledState = state.compile(`A`).toTestState
+        assert(compiledState.status == ExitStatus.Ok)
+        assertSemanticdbFileFor("Foo.scala", compiledState)
+        assertSemanticdbFileFor("Bar.java", compiledState)
+      }
+    }
+  }
+
   test("compile is successful with semanticDB and javac processorpath") {
     TestUtil.withinWorkspace { workspace =>
       val logger = new RecordingLogger(ansiCodesSupported = false)

diff --git a/frontend/src/test/scala/bloop/testing/BloopHelpers.scala b/frontend/src/test/scala/bloop/testing/BloopHelpers.scala
@@ -28,6 +28,7 @@ import bloop.util.TestUtil
 
 import monix.execution.CancelableFuture
 import monix.execution.Scheduler
+import bloop.logging.NoopLogger
 
 trait BloopHelpers {
   def loadState(
@@ -87,7 +88,8 @@ trait BloopHelpers {
       baseDir,
       workspace.underlying,
       ExecutionContext.ioScheduler,
-      enableCancellation = false
+      enableCancellation = false,
+      logger
     )
 
     val loadFromNewWorkspace = copyToNewWorkspace.flatMap { _ =>
@@ -305,7 +307,8 @@ trait BloopHelpers {
               classesDir,
               newClassesDir,
               ExecutionContext.ioScheduler,
-              enableCancellation = false
+              enableCancellation = false,
+              NoopLogger
             )
 
             backupDir.map { _ =>