wait if there is just one key

Author: soulomoon

hls-graph/src/Development/IDE/Graph/Internal/Database.hs

@@ -109,6 +109,7 @@ builder db@Database{..} stack keys = withRunInIO $ \(RunInIO run) -> do
     -- Things that I need to force before my results are ready
     toForce <- liftIO $ newTVarIO []
     current <- liftIO $ readTVarIO databaseStep
+    let spawnOrWait = if length keys > 1 then Spawn else Wait
     results <- liftIO $ for keys $ \id ->
         -- Updating the status of all the dependencies atomically is not necessary.
         -- Therefore, run one transaction per dep. to avoid contention
@@ -126,7 +127,7 @@ builder db@Database{..} stack keys = withRunInIO $ \(RunInIO run) -> do
                     let act = run (refresh db stack id s)
                         (force, val) = splitIO act
                     SMap.focus (updateStatus $ Running current force val s) id databaseValues
-                    modifyTVar' toForce (Spawn force:)
+                    modifyTVar' toForce (spawnOrWait force:)
                     pure val
 
             pure (id, val)
@@ -312,20 +313,6 @@ runAIO (AIO act) = do
 
 -- | Like 'async' but with built-in cancellation.
 --   Returns an IO action to wait on the result.
-asyncWithCleanUp :: AIO a -> AIO (IO a)
-asyncWithCleanUp act = do
-    st <- AIO ask
-    io <- unliftAIO act
-    -- mask to make sure we keep track of the spawned async
-    liftIO $ uninterruptibleMask $ \restore -> do
-        a <- async $ restore io
-        atomicModifyIORef'_ st (void a :)
-        return $ wait a
-
-unliftAIO :: AIO a -> AIO (IO a)
-unliftAIO act = do
-    st <- AIO ask
-    return $ runReaderT (unAIO act) st
 
 newtype RunInIO = RunInIO (forall a. AIO a -> IO a)