bugfix: add user config promise

scalameta · Oct 17, 2023 · a2d4ebc · a2d4ebc
1 parent b1038e6
commit a2d4ebc
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/MetalsLspService.scala b/metals/src/main/scala/scala/meta/internal/metals/MetalsLspService.scala
@@ -137,6 +137,7 @@ class MetalsLspService(
 
   @volatile
   private var userConfig: UserConfiguration = initialUserConfig
+  private val userConfigPromise: Promise[Unit] = Promise()
 
   ThreadPools.discardRejectedRunnables("MetalsLanguageServer.sh", sh)
   ThreadPools.discardRejectedRunnables("MetalsLanguageServer.ec", ec)
@@ -929,6 +930,7 @@ class MetalsLspService(
   def setUserConfig(newConfig: UserConfiguration): UserConfiguration = {
     val old = userConfig
     userConfig = newConfig
+    userConfigPromise.trySuccess(())
     old
   }
 
@@ -1549,10 +1551,13 @@ class MetalsLspService(
       params: SemanticTokensParams
   ): CompletableFuture[SemanticTokens] = {
     CancelTokens.future { token =>
-      compilers.semanticTokens(params, token).map { semanticTokens =>
-        if (semanticTokens.getData().isEmpty()) null
-        else semanticTokens
-      }
+      for {
+        _ <- userConfigPromise.future
+        res <- compilers.semanticTokens(params, token).map { semanticTokens =>
+          if (semanticTokens.getData().isEmpty()) null
+          else semanticTokens
+        }
+      } yield res
     }
   }