wait for the session to be restarted

Author: soulomoon

ghcide/src/Development/IDE/Core/Shake.hs

@@ -762,12 +762,11 @@ delayedAction a = do
 shakeRestart :: Recorder (WithPriority Log) -> IdeState -> VFSModified -> String -> [DelayedAction ()] -> IO [Key] -> IO ()
 shakeRestart recorder IdeState{..} vfs reason acts ioActionBetweenShakeSession = do
     barrier <- newBarrier
-    atomically $ writeTQueue (shakeOpQueue $ shakeExtras) $
+    atomically $ writeTQueue (shakeOpQueue $ shakeExtras) $ do
         withMVar'
             shakeSession
             (\runner -> do
                 (stopTime,()) <- duration $ logErrorAfter 10 $ cancelShakeSession runner
-                signalBarrier barrier ()
                 keys <- ioActionBetweenShakeSession
                 atomically $ modifyTVar' (dirtyKeys shakeExtras) $ \x -> foldl' (flip insertKeySet) x keys
                 res <- shakeDatabaseProfile shakeDb
@@ -782,6 +781,7 @@ shakeRestart recorder IdeState{..} vfs reason acts ioActionBetweenShakeSession =
             -- See https://github.com/haskell/ghcide/issues/79
             (\() -> do
             (,()) <$> newSession recorder shakeExtras vfs shakeDb acts reason)
+        signalBarrier barrier ()
     waitBarrier barrier
         where
             logErrorAfter :: Seconds -> IO () -> IO ()

ghcide/src/Development/IDE/Main.hs

@@ -341,6 +341,7 @@ defaultMain recorder Arguments{..} = withHeapStats (cmapWithPrio LogHeapStats re
                               }
                       caps = LSP.resClientCapabilities env
                   monitoring <- argsMonitoring
+
                   ide <- initialise
                       (cmapWithPrio LogService recorder)
                       argsDefaultHlsConfig