Skip to content

Commit ce378a9

Browse files
committed
Correct completion token placement
1 parent 16e58b8 commit ce378a9

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ lookupMod HieDbWriter{indexQueue} hieFile moduleName uid _boot = MaybeT $ do
7272
moduleSource <- hie_hs_src <$> loadHieFile (mkUpdater nc) hieFile
7373
BS.writeFile writeOutPath moduleSource
7474
liftIO $ atomically $
75-
unGetTQueue indexQueue $ \withHieDb -> withHieDb $ \db -> do
76-
HieDb.addSrcFile db hieFile writeOutPath False
75+
unGetTQueue indexQueue $ \withHieDb -> do
76+
withHieDb $ \db ->
77+
HieDb.addSrcFile db hieFile writeOutPath False
7778
putMVar completionToken ()
7879
pure $ moduleUri
7980
where

ghcide/src/Development/IDE/Types/HscEnvEq.hs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module Development.IDE.Types.HscEnvEq
1515
import Control.Concurrent.Async (Async, async, waitCatch)
1616
import Control.Concurrent.MVar (newEmptyMVar, putMVar, readMVar)
1717
import Control.Concurrent.STM (atomically)
18-
import Control.Concurrent.STM.TQueue (unGetTQueue)
18+
import Control.Concurrent.STM.TQueue (writeTQueue)
1919
import Control.Concurrent.Strict (modifyVar, newVar)
2020
import Control.DeepSeq (force)
2121
import Control.Exception (evaluate, mask, throwIO)
@@ -133,9 +133,10 @@ newHscEnvEqWithImportPaths envImportPaths recorder se hscEnv deps = do
133133
deleteMissingDependencySources :: IO ()
134134
deleteMissingDependencySources = do
135135
completionToken <- newEmptyMVar
136-
atomically $ unGetTQueue (indexQueue $ hiedbWriter se) $
137-
\withHieDb -> withHieDb $ \db -> do
138-
removeDependencySrcFiles db
136+
atomically $ writeTQueue (indexQueue $ hiedbWriter se) $
137+
\withHieDb -> do
138+
withHieDb $ \db ->
139+
removeDependencySrcFiles db
139140
putMVar completionToken ()
140141
readMVar completionToken
141142
indexPackageHieFiles :: Package -> [Module] -> IO ()

0 commit comments

Comments
 (0)