remove unsafeInterleaveIO

haskell · Apr 3, 2024 · 61b4808 · 61b4808
1 parent 7dc82ce
commit 61b4808
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/ghcide/src/Development/IDE/LSP/LanguageServer.hs b/ghcide/src/Development/IDE/LSP/LanguageServer.hs
@@ -202,14 +202,6 @@ handleInit recorder getHieDbLoc getIdeState lifetime exitClientMsg clearReqId wa
     -- The database needs to be open for the duration of the reactor thread, but we need to pass in a reference
     -- to 'getIdeState', so we use this dirty trick
     dbMVar <- newEmptyMVar
-    ~(WithHieDbShield withHieDb,hieChan) <- unsafeInterleaveIO $ takeMVar dbMVar
-
-    ide <- getIdeState env root withHieDb hieChan
-
-    let initConfig = parseConfiguration params
-
-    logWith recorder Info $ LogRegisteringIdeConfig initConfig
-    registerIdeConfiguration (shakeExtras ide) initConfig
 
     let handleServerException (Left e) = do
             logWith recorder Error $ LogReactorThreadException e
@@ -246,6 +238,11 @@ handleInit recorder getHieDbLoc getIdeState lifetime exitClientMsg clearReqId wa
                     ReactorNotification act -> handle exceptionInHandler act
                     ReactorRequest _id act k -> void $ async $ checkCancelled _id act k
         logWith recorder Info LogReactorThreadStopped
+    (WithHieDbShield withHieDb,hieChan) <- takeMVar dbMVar
+    ide <- getIdeState env root withHieDb hieChan
+    let initConfig = parseConfiguration params
+    logWith recorder Info $ LogRegisteringIdeConfig initConfig
+    registerIdeConfiguration (shakeExtras ide) initConfig
     pure $ Right (env,ide)