use evalContT

soulomoon · May 27, 2024 · fb0a370 · fb0a370
1 parent da56bfb
commit fb0a370
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ghcide/session-loader/Development/IDE/Session.hs b/ghcide/session-loader/Development/IDE/Session.hs
@@ -101,8 +101,8 @@ import           Control.Concurrent.STM.Stats         (atomically, modifyTVar',
 import           Control.Concurrent.STM.TQueue
 import           Control.DeepSeq
 import           Control.Exception                    (evaluate)
-import           Control.Monad.Cont                   (ContT (ContT), runContT)
 import           Control.Monad.IO.Unlift              (MonadUnliftIO)
+import           Control.Monad.Trans.Cont             (ContT (ContT), evalContT)
 import           Data.Foldable                        (for_)
 import           Data.HashMap.Strict                  (HashMap)
 import           Data.HashSet                         (HashSet)
@@ -397,7 +397,7 @@ dbThread = ThreadRun {
             recorder
             rng
             (withHieDb fp (const $ pure ()) `Safe.catch` \IncompatibleSchemaVersion{} -> removeFile fp)
-        flip runContT return $ do
+        evalContT $ do
             writeDb <- ContT $ withHieDb fp
             readDb <- ContT $ withHieDb fp
             let withWriteDbRetryable :: WithHieDb

diff --git a/ghcide/src/Development/IDE/LSP/LanguageServer.hs b/ghcide/src/Development/IDE/LSP/LanguageServer.hs
@@ -38,8 +38,8 @@ import           UnliftIO.Directory
 import           UnliftIO.Exception
 
 import qualified Colog.Core                            as Colog
-import           Control.Monad.Cont                    (ContT (ContT, runContT))
 import           Control.Monad.IO.Unlift               (MonadUnliftIO)
+import           Control.Monad.Trans.Cont              (ContT (evalContT))
 import           Development.IDE.Core.IdeConfiguration
 import           Development.IDE.Core.Shake            hiding (Log)
 import           Development.IDE.Core.Thread           (ThreadRun (..),
@@ -253,7 +253,7 @@ handleInit recorder getHieDbLoc getIdeState lifetime exitClientMsg clearReqId wa
 
 
 runWithDb :: Recorder (WithPriority Session.Log) -> FilePath -> (WithHieDb -> ThreadQueue -> IO ()) -> IO ()
-runWithDb recorder dbLoc f = flip runContT return $ do
+runWithDb recorder dbLoc f = evalContT $ do
             (_, sessionRestartTQueue) <- runInThread sessionRestartThread ()
             (_, sessionLoaderTQueue) <- runInThread sessionLoaderThread ()
             (WithHieDbShield hiedb, hieChan) <- runInThread dbThread (recorder, dbLoc)