chore: Remove unused bloop properties

scalameta · Aug 8, 2024 · 7a78512 · 7a78512
1 parent d9f336b
commit 7a78512
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/BloopServers.scala b/metals/src/main/scala/scala/meta/internal/metals/BloopServers.scala
@@ -287,9 +287,7 @@ final class BloopServers(
   ) = {
 
     val addr = BloopRifleConfig.Address.DomainSocket(
-      serverConfig.bloopDirectory
-        .getOrElse(bloopDaemonDir)
-        .toNIO
+      bloopDaemonDir.toNIO
     )
 
     val config = BloopRifleConfig
@@ -439,7 +437,7 @@ object BloopServers {
   private[BloopServers] val connectionCounter = new AtomicInteger(0)
 
   private val bloopDirectories = {
-    // Scala CLI is still used since we wanted to avoid breaking thigns
+    // Scala CLI is still used since we wanted to avoid having two separate servers
     ProjectDirectories.from(null, null, "ScalaCli")
   }
 

diff --git a/metals/src/main/scala/scala/meta/internal/metals/MetalsServerConfig.scala b/metals/src/main/scala/scala/meta/internal/metals/MetalsServerConfig.scala
@@ -5,7 +5,6 @@ import scala.util.Try
 
 import scala.meta.internal.metals.Configs._
 import scala.meta.internal.pc.PresentationCompilerConfigImpl
-import scala.meta.io.AbsolutePath
 import scala.meta.pc.PresentationCompilerConfig.OverrideDefFormat
 
 /**
@@ -85,13 +84,6 @@ final case class MetalsServerConfig(
       "metals.allow-multiline-string-formatting",
       default = true,
     ),
-    bloopPort: Option[Int] = Option(System.getProperty("metals.bloop-port"))
-      .filter(_.forall(Character.isDigit(_)))
-      .map(_.toInt),
-    bloopDirectory: Option[AbsolutePath] =
-      Option(System.getProperty("metals.bloop-dir"))
-        .filter(_.trim.nonEmpty)
-        .map(AbsolutePath(_)),
     macOsMaxWatchRoots: Int =
       Option(System.getProperty("metals.macos-max-watch-roots"))
         .filter(_.forall(Character.isDigit(_)))
@@ -143,7 +135,6 @@ final case class MetalsServerConfig(
       s"ask-to-reconnect=$askToReconnect",
       s"icons=$icons",
       s"statistics=$statistics",
-      s"bloop-port=${bloopPort.map(_.toString()).getOrElse("default")}",
       s"macos-max-watch-roots=${macOsMaxWatchRoots}",
       s"loglevel=${loglevel}",
       s"max-logfile-size=${maxLogFileSize}",

diff --git a/metals/src/main/scala/scala/meta/internal/metals/ProjectMetalsLspService.scala b/metals/src/main/scala/scala/meta/internal/metals/ProjectMetalsLspService.scala
@@ -155,6 +155,7 @@ class ProjectMetalsLspService(
     tables,
     clientConfig.initialConfig,
     workDoneProgress,
+    sh,
   )
 
   val connectionProvider: ConnectionProvider = new ConnectionProvider(

diff --git a/tests/unit/src/test/scala/tests/BuildServerConnectionLspSuite.scala b/tests/unit/src/test/scala/tests/BuildServerConnectionLspSuite.scala
@@ -41,9 +41,9 @@ class BuildServerConnectionLspSuite
     } yield ()
   }
 
-  test("bloop-version-change".ignore) {
+  test("bloop-version-change") {
     cleanWorkspace()
-    val updatedBloopVersion = "1.4.0-RC1-76-1488031d"
+    val updatedBloopVersion = "2.0.0-RC1-2-62717f42-SNAPSHOT"
     for {
       _ <- initialize(
         s"""|/metals.json