improvement: queue or cancel previous connect request

scalameta · Aug 20, 2024 · b1564af · b1564af
1 parent e537ad6
commit b1564af
Show file tree

Hide file tree

Showing 6 changed files with 350 additions and 118 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/bsp/BuildChange.scala b/metals/src/main/scala/scala/meta/internal/bsp/BuildChange.scala
@@ -12,4 +12,5 @@ object BuildChange {
   case object Failed extends BuildChange
   case object Reconnected extends BuildChange
   case object Reloaded extends BuildChange
+  case object Cancelled extends BuildChange
 }
diff --git a/metals/src/main/scala/scala/meta/internal/builds/BloopInstall.scala b/metals/src/main/scala/scala/meta/internal/builds/BloopInstall.scala
@@ -1,7 +1,6 @@
 package scala.meta.internal.builds
 
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicBoolean
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
@@ -37,33 +36,23 @@ final class BloopInstall(
   override def toString: String = s"BloopInstall($workspace)"
 
   def runUnconditionally(
-      buildTool: BloopInstallProvider,
-      isImportInProcess: AtomicBoolean,
+      buildTool: BloopInstallProvider
   ): Future[WorkspaceLoadedStatus] = {
-    if (isImportInProcess.compareAndSet(false, true)) {
-      buildTool.bloopInstall(
-        workspace,
-        args => {
-          scribe.info(s"running '${args.mkString(" ")}'")
-          val process =
-            runArgumentsUnconditionally(buildTool, args, userConfig().javaHome)
-          process.foreach { e =>
-            if (e.isFailed) {
-              // Record the exact command that failed to help troubleshooting.
-              scribe.error(s"$buildTool command failed: ${args.mkString(" ")}")
-            }
+    buildTool.bloopInstall(
+      workspace,
+      args => {
+        scribe.info(s"running '${args.mkString(" ")}'")
+        val process =
+          runArgumentsUnconditionally(buildTool, args, userConfig().javaHome)
+        process.foreach { e =>
+          if (e.isFailed) {
+            // Record the exact command that failed to help troubleshooting.
+            scribe.error(s"$buildTool command failed: ${args.mkString(" ")}")
           }
-          process.onComplete(_ => isImportInProcess.set(false))
-          process
-        },
-      )
-    } else {
-      Future
-        .successful {
-          languageClient.showMessage(ImportAlreadyRunning)
-          WorkspaceLoadedStatus.Dismissed
         }
-    }
+        process
+      },
+    )
   }
 
   private def runArgumentsUnconditionally(
@@ -123,7 +112,6 @@ final class BloopInstall(
   def runIfApproved(
       buildTool: BloopInstallProvider,
       digest: String,
-      isImportInProcess: AtomicBoolean,
   ): Future[WorkspaceLoadedStatus] =
     synchronized {
       oldInstallResult(digest) match {
@@ -133,7 +121,7 @@ final class BloopInstall(
           Future.successful(result)
         case _ =>
           if (userConfig().shouldAutoImportNewProject) {
-            runUnconditionally(buildTool, isImportInProcess)
+            runUnconditionally(buildTool)
           } else {
             scribe.debug("Awaiting user response...")
             for {
@@ -145,7 +133,7 @@ final class BloopInstall(
               )
               installResult <- {
                 if (userResponse.isYes) {
-                  runUnconditionally(buildTool, isImportInProcess)
+                  runUnconditionally(buildTool)
                 } else {
                   // Don't spam the user with requests during rapid build changes.
                   notification.dismiss(2, TimeUnit.MINUTES)