improvement: add timeout to fix java version for sbt request

scalameta · Oct 5, 2023 · 52138d0 · 52138d0
1 parent e3b108a
commit 52138d0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala b/metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala
@@ -3,6 +3,8 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.Properties
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
@@ -206,6 +208,8 @@ case class SbtBuildTool(
             shutdownBspServer(shellRunner).ignoreValue
           case _ => Future.successful(())
         }
+        .withTimeout(10, TimeUnit.SECONDS)
+        .recover { case _: TimeoutException => Future.successful(()) }
     }
 }