bugfix: handle created build server config before all content written

scalameta · Oct 10, 2023 · a0dc5b9 · a0dc5b9
1 parent 2a57231
commit a0dc5b9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/builds/BuildTools.scala b/metals/src/main/scala/scala/meta/internal/builds/BuildTools.scala
@@ -10,6 +10,7 @@ import scala.meta.internal.metals.BloopServers
 import scala.meta.internal.metals.MetalsEnrichments._
 import scala.meta.internal.metals.UserConfiguration
 import scala.meta.io.AbsolutePath
+import ujson.ParsingFailedException
 
 /**
  * Detects what build tool is used in this workspace.
@@ -80,13 +81,17 @@ final class BuildTools(
   def scalaCliProject: Option[AbsolutePath] =
     searchForBuildTool(_.resolve("project.scala").isFile)
       .orElse {
-        ScalaCliBspScope.scalaCliBspRoot(workspace) match {
-          case Nil => None
-          case path :: Nil if path.isFile => Some(path.parent)
-          case path :: Nil =>
-            scribe.info(s"path: $path")
-            Some(path)
-          case _ => Some(workspace)
+        try {
+          ScalaCliBspScope.scalaCliBspRoot(workspace) match {
+            case Nil => None
+            case path :: Nil if path.isFile => Some(path.parent)
+            case path :: Nil => Some(path)
+            case _ => Some(workspace)
+          }
+        } catch {
+          case _: ParsingFailedException =>
+            scribe.warn(s"could not parse scala-cli build server configuration")
+            None
         }
       }
 

diff --git a/metals/src/main/scala/scala/meta/internal/metals/MetalsLspService.scala b/metals/src/main/scala/scala/meta/internal/metals/MetalsLspService.scala
@@ -92,6 +92,7 @@ import org.eclipse.lsp4j.ExecuteCommandParams
 import org.eclipse.lsp4j._
 import org.eclipse.lsp4j.jsonrpc.messages.{Either => JEither}
 import org.eclipse.{lsp4j => l}
+import scala.util.Try
 
 /**
  * Metals implementation of the Scala Language Service.
@@ -1267,7 +1268,8 @@ class MetalsLspService(
 
     event.eventType match {
       case EventType.CreateOrModify
-          if path.isInBspDirectory(folder) && path.extension == "json" =>
+          if path.isInBspDirectory(folder) && path.extension == "json"
+            && isValidBspFile(path) =>
         scribe.info(s"Detected new build tool in $path")
         quickConnectToBuildServer()
       case _ =>
@@ -1305,6 +1307,9 @@ class MetalsLspService(
     }
   }
 
+  private def isValidBspFile(path: AbsolutePath): Boolean =
+    path.readTextOpt.exists(text => Try(ujson.read(text)).toOption.nonEmpty)
+
   private def onChange(paths: Seq[AbsolutePath]): Future[Unit] = {
     paths.foreach { path =>
       fingerprints.add(path, FileIO.slurp(path, charset))