bugfix: deduplicate auto connect requests for scala-cli

scalameta · Sep 14, 2023 · a3edc1e · a3edc1e
1 parent d7be734
commit a3edc1e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/builds/ScalaCliBuildTool.scala b/metals/src/main/scala/scala/meta/internal/builds/ScalaCliBuildTool.scala
@@ -35,16 +35,6 @@ class ScalaCliBuildTool(
       Future.successful(Generated)
     }
 
-  def createBspConfigIfNone(
-      workspace: AbsolutePath,
-      systemProcess: List[String] => Future[BspConfigGenerationStatus],
-      statusBar: StatusBar,
-  ): Future[BspConfigGenerationStatus] = {
-    if (ScalaCliBuildTool.pathsToScalaCliBsp(workspace).exists(_.isFile))
-      Future.successful(Generated)
-    else generateBspConfig(workspace, systemProcess, statusBar)
-  }
-
   override def createBspFileArgs(
       workspace: AbsolutePath
   ): Option[List[String]] =

diff --git a/metals/src/main/scala/scala/meta/internal/metals/MetalsLspService.scala b/metals/src/main/scala/scala/meta/internal/metals/MetalsLspService.scala
@@ -1991,16 +1991,19 @@ class MetalsLspService(
               Future.successful(BuildChange.None)
             case (Some(_), buildTool: ScalaCliBuildTool)
                 if chosenBuildServer.isEmpty =>
-              for {
-                _ <- buildTool.createBspConfigIfNone(
-                  folder,
-                  args =>
-                    bspConfigGenerator.runUnconditionally(buildTool, args),
-                  statusBar,
-                )
-                _ = tables.buildServers.chooseServer(ScalaCliBuildTool.name)
-                buildChange <- quickConnectToBuildServer()
-              } yield buildChange
+              tables.buildServers.chooseServer(ScalaCliBuildTool.name)
+              val scalaCliBspConfigExists =
+                ScalaCliBuildTool.pathsToScalaCliBsp(folder).exists(_.isFile)
+              if (scalaCliBspConfigExists) Future.successful(BuildChange.None)
+              else
+                buildTool
+                  .generateBspConfig(
+                    folder,
+                    args =>
+                      bspConfigGenerator.runUnconditionally(buildTool, args),
+                    statusBar,
+                  )
+                  .flatMap(_ => quickConnectToBuildServer())
             case (Some(digest), _) if isBloopOrEmpty =>
               slowConnectToBloopServer(forceImport, buildTool, digest)
             case (Some(digest), _) =>

diff --git a/tests/slow/src/test/scala/tests/scalacli/ScalaCliSuite.scala b/tests/slow/src/test/scala/tests/scalacli/ScalaCliSuite.scala
@@ -388,7 +388,7 @@ class ScalaCliSuite extends BaseScalaCliSuite(V.scala3) {
       .inverseSources(workspace.resolve(fileName))
       .isDefined
     for {
-      _ <- scalaCliInitialize(useBsp = false)(
+      _ <- initialize(
         s"""/src/Main.scala
            |object Main:
            |  def foo = 3