bugfix: add user config promise

scalameta · Oct 16, 2023 · 4347ad4 · 4347ad4
1 parent 63a65d2
commit 4347ad4
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)
@@ -926,6 +927,7 @@ class MetalsLspService(
   }
 
   def setUserConfig(newConfig: UserConfiguration): UserConfiguration = {
+    userConfigPromise.trySuccess(())
     val old = userConfig
     userConfig = newConfig
     old
@@ -1548,10 +1550,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
     }
   }