fix import

Author: soulomoon

ghcide/session-loader/Development/IDE/Session.hs

@@ -84,15 +84,14 @@ import           Data.Void
 
 import           Control.Concurrent.STM.Stats        (atomically, modifyTVar',
                                                       readTVar, writeTVar)
-import           Control.Concurrent.STM.TQueue
 import           Control.Monad.Trans.Cont            (ContT (ContT, runContT))
 import           Data.Foldable                       (for_)
 import           Data.HashMap.Strict                 (HashMap)
 import           Data.HashSet                        (HashSet)
 import qualified Data.HashSet                        as Set
 import           Database.SQLite.Simple
 import           Development.IDE.Core.Tracing        (withTrace)
-import           Development.IDE.Core.WorkerThread   (withWorkerQueue)
+import           Development.IDE.Core.WorkerThread
 import           Development.IDE.Session.Dependency
 import           Development.IDE.Session.Diagnostics (renderCradleError)
 import           Development.IDE.Session.Ghc         hiding (Log)
@@ -664,7 +663,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
     -- see Note [Serializing runs in separate thread]
     -- Start the 'getOptionsLoop' if the queue is empty
     liftIO $ atomically $
-      Extra.whenM (isEmptyTQueue que) $ do
+      Extra.whenM (isEmptyTaskQueue que) $ do
         let newSessionLoadingOptions = SessionLoadingOptions
               { findCradle = cradleLoc
               , ..
@@ -684,7 +683,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
               , sessionLoadingOptions = newSessionLoadingOptions
               }
 
-        writeTQueue que (runReaderT (getOptionsLoop recorder sessionShake sessionState knownTargetsVar) sessionEnv)
+        writeTaskQueue que (runReaderT (getOptionsLoop recorder sessionShake sessionState knownTargetsVar) sessionEnv)
 
     -- Each one of deps will be registered as a FileSystemWatcher in the GhcSession action
     -- so that we can get a workspace/didChangeWatchedFiles notification when a dep changes.

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

@@ -11,6 +11,7 @@ module Development.IDE.Core.WorkerThread
     withWorkerQueue,
     awaitRunInThread,
     TaskQueue,
+    isEmptyTaskQueue,
     writeTaskQueue,
     withWorkerQueueSimple
   )
@@ -22,7 +23,6 @@ import           Control.Concurrent.Strict (newBarrier, signalBarrier,
                                             waitBarrier)
 import           Control.Exception.Safe    (SomeException, finally, throwIO,
                                             try)
-import           Control.Monad             (forever)
 import           Control.Monad.Cont        (ContT (ContT))
 import qualified Data.Text                 as T
 import           Ide.Logger
@@ -117,5 +117,8 @@ awaitRunInThread (TaskQueue q) act = do
 writeTaskQueue :: TaskQueue a -> a -> STM ()
 writeTaskQueue (TaskQueue q) = writeTQueue q
 
+isEmptyTaskQueue :: TaskQueue a -> STM Bool
+isEmptyTaskQueue (TaskQueue q) = isEmptyTQueue q
+
 tryReadTaskQueue :: TaskQueue a -> STM (Maybe a)
 tryReadTaskQueue (TaskQueue q) = tryReadTQueue q