(#144) Simplify and clean up the startup a bit

ant-druha · Oct 20, 2023 · f584fd4 · f584fd4
1 parent 1e6c420
commit f584fd4
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/...ain/kotlin/com/intellij/plugin/powershell/lang/lsp/languagehost/LanguageServerEndpoint.kt b/...ain/kotlin/com/intellij/plugin/powershell/lang/lsp/languagehost/LanguageServerEndpoint.kt
@@ -90,7 +90,7 @@ class LanguageServerEndpoint(
 
   fun start() {
     coroutineScope.launchNow {
-      checkStarted()
+      ensureStarted()
       val capabilities = getServerCapabilities()
       if (capabilities != null) {
         //todo move it to LanguageHostConnectionManager (notify it when server initialized)
@@ -108,7 +108,7 @@ class LanguageServerEndpoint(
     val uri = VfsUtil.toUri(File(file.path))
     connectedEditors.computeIfAbsent(uri) {
       coroutineScope.async {
-        checkStarted()
+        ensureStarted()
         val capabilities = getServerCapabilities()
         if (capabilities != null) {
           LOG.runAndLogException {
@@ -147,7 +147,7 @@ class LanguageServerEndpoint(
   }
 
   private suspend fun getServerCapabilities(): ServerCapabilities? {
-    checkStarted()
+    ensureStarted()
     val initialization = synchronized(serverInitializationLock) { serverInitialization }
     return initialization?.await()?.capabilities
   }
@@ -201,19 +201,13 @@ class LanguageServerEndpoint(
     }
   }
 
-  private suspend fun checkStarted() {
-    synchronized(serverInitializationLock) {
-      if (serverInitialization == null) {
-        serverInitialization = scheduleStart()
-      }
-    }
-
-    LOG.runAndLogException {
-      val initialization = synchronized(serverInitializationLock) {
-        serverInitialization
+  private suspend fun ensureStarted() {
+    val initialization = synchronized(serverInitializationLock) {
+      serverInitialization ?: scheduleStart().also {
+        serverInitialization = it
       }
-      initialization?.await()
     }
+    initialization.await()
   }
 
   private fun scheduleStart(): Deferred<InitializeResult?> {