only one cradle should run

Author: soulomoon

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

@@ -531,7 +531,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir = do
 --                 -> Action (IdeResult HscEnvEq,[FilePath])
   let session args@(hieYaml, _cfp, _opts, _libDir) = do
           ShakeExtras{ideNc} <- getShakeExtras
-          IdeOptions{ optCheckProject = getCheckProject , optExtensions } <- getIdeOptions
+          IdeOptions{ optExtensions } <- getIdeOptions
           (new_deps, old_deps) <- packageSetup args
 
           -- For each component, now make a new HscEnvEq which contains the
@@ -797,22 +797,20 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir = do
     -- before attempting to do so.
     ShakeExtras{restartShakeSession } <- getShakeExtras
     IdeOptions{ optCheckProject = getCheckProject} <- getIdeOptions
-    returnWithVersion $ \file ->
+    returnWithVersion $ \file -> do
         -- only one cradle consult at a time
-        UnliftIO.withMVar cradleLock $ const $ do
-            -- we need to find a way to get rid of the (files, keys)
-        _opts@(a, b, _files, _keys) <- use_ HieYaml file
-        -- _opts@(a, b, _files, _keys) <- getOptions file
-        async <- UnliftIO.async $ do
+        async <- UnliftIO.async $ UnliftIO.withMVar cradleLock $ const $ do
+                -- we need to find a way to get rid of the (files, keys)
+            _opts@(a, b, _files, _keys) <- use_ HieYaml file
             files <- liftIO $ atomically $ swapTVar targetFiles []
             keys <- liftIO $ atomically $ swapTVar restartKeys []
             _ <- useNoFile_ SessionCacheVersion
             liftIO $ when (notNull files || notNull keys) $ do
                 checkProject <- getCheckProject
                 -- think of not to restart a second time
                 restartShakeSession VFSUnmodified "new component" (if checkProject then return (typecheckAll files) else mempty) $ pure keys
-        UnliftIO.wait async
-        pure $ (fmap . fmap) toAbsolutePath (a, b))
+            pure $ (fmap . fmap) toAbsolutePath (a, b)
+        UnliftIO.wait async)
 
 
 -- | Run the specific cradle on a specific FilePath via hie-bios.
@@ -1135,17 +1133,6 @@ type FlagsMap = Map.Map (Maybe FilePath) (HM.HashMap NormalizedFilePath (IdeResu
 -- It aims to be the reverse of 'FlagsMap'.
 type FilesMap = HM.HashMap NormalizedFilePath (Maybe FilePath)
 
--- file1 -> hie1.yaml -> (opts, deps)
--- file2 -> hie1.yaml -> (opts, deps)
--- file3 -> hie1.yaml -> (opts, deps)
--- if some new file4 should be in hie1.yaml,
-    -- we need to recompute the hie1.yaml
-
--- hieRule file
--- get corresponding hie.yaml
-
-
-
 -- This is pristine information about a component
 data RawComponentInfo = RawComponentInfo
   { rawComponentUnitId         :: UnitId