bugfix: Don't send best effort flag when disabled

I don't think this changes anything as we did also set build server config, but just in case.
scalameta · Nov 25, 2024 · cb68617 · cb68617
1 parent 35af524
commit cb68617
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/Compilations.scala b/metals/src/main/scala/scala/meta/internal/metals/Compilations.scala
@@ -32,6 +32,7 @@ final class Compilations(
     onStartCompilation: () => Unit,
     userConfiguration: () => UserConfiguration,
     downstreamTargets: PreviouslyCompiledDownsteamTargets,
+    bestEffortEnabled: Boolean,
 )(implicit ec: ExecutionContext) {
   private val compileTimeout: Timeout =
     Timeout("compile", Duration(10, TimeUnit.MINUTES))
@@ -266,12 +267,12 @@ final class Compilations(
     scribe.debug("Compiling " + targets.mkString(", "))
     val originId = "METALS-$" + UUID.randomUUID().toString
     val params = new b.CompileParams(targets.asJava)
+    val addBestEffort =
+      (connection.isBloop || connection.isScalaCLI) && bestEffortEnabled
     params.setOriginId(originId)
-    if (
-      userConfiguration().verboseCompilation && (connection.isBloop || connection.isScalaCLI)
-    ) {
+    if (userConfiguration().verboseCompilation && addBestEffort) {
       params.setArguments(List("--verbose", "--best-effort").asJava)
-    } else if (connection.isBloop || connection.isScalaCLI) {
+    } else if (addBestEffort) {
       params.setArguments(List("--best-effort").asJava)
     } else params.setArguments(Nil.asJava)
     targets.foreach { target =>

diff --git a/metals/src/main/scala/scala/meta/internal/metals/MetalsLspService.scala b/metals/src/main/scala/scala/meta/internal/metals/MetalsLspService.scala
@@ -222,6 +222,7 @@ abstract class MetalsLspService(
     onStartCompilation,
     () => userConfig,
     downstreamTargets,
+    clientConfig.initialConfig.enableBestEffort,
   )
   var indexingPromise: Promise[Unit] = Promise[Unit]()
   def buildServerPromise: Promise[Unit]