rename

Author: soulomoon

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

@@ -595,7 +595,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
           -- For GHC's supporting multi component sessions, we create a shared
           -- HscEnv but set the active component accordingly
           hscEnv <- emptyHscEnv ideNc _libDir
-          let new_cache = newComponentCache' recorder optExtensions cfps hscEnv
+          let new_cache = newComponentCache recorder optExtensions cfps hscEnv
           all_target_details <- new_cache old_deps new_deps
           let all_targets' = concat all_target_details
               flags_map' = HM.fromList (concatMap toFlagsMap all_targets')
@@ -944,15 +944,15 @@ checkHomeUnitsClosed' ue home_id_set
 -- This combines all the components we know about into
 -- an appropriate session, which is a multi component
 -- session on GHC 9.4+
-newComponentCache'
+newComponentCache
          :: Recorder (WithPriority Log)
          -> [String]           -- ^ File extensions to consider
          -> [NormalizedFilePath] -- ^ Path to file that caused the creation of this component
          -> HscEnv             -- ^ An empty HscEnv
          -> [ComponentInfo]    -- ^ New components to be loaded
          -> [ComponentInfo]    -- ^ old, already existing components
          -> IO [ [TargetDetails] ]
-newComponentCache' recorder exts cfps hsc_env old_cis new_cis = do
+newComponentCache recorder exts cfps hsc_env old_cis new_cis = do
     let cis = Map.unionWith unionCIs (mkMap new_cis) (mkMap old_cis)
         -- When we have multiple components with the same uid,
         -- prefer the new one over the old.
@@ -1008,74 +1008,6 @@ newComponentCache' recorder exts cfps hsc_env old_cis new_cis = do
 
       return (L.nubOrdOn targetTarget ctargets)
 
--- | Create a mapping from FilePaths to HscEnvEqs
--- This combines all the components we know about into
--- an appropriate session, which is a multi component
--- session on GHC 9.4+
-newComponentCache
-         :: Recorder (WithPriority Log)
-         -> [String]           -- ^ File extensions to consider
-         -> NormalizedFilePath -- ^ Path to file that caused the creation of this component
-         -> HscEnv             -- ^ An empty HscEnv
-         -> [ComponentInfo]    -- ^ New components to be loaded
-         -> [ComponentInfo]    -- ^ old, already existing components
-         -> IO [ [TargetDetails] ]
-newComponentCache recorder exts _cfp hsc_env old_cis new_cis = do
-    let cis = Map.unionWith unionCIs (mkMap new_cis) (mkMap old_cis)
-        -- When we have multiple components with the same uid,
-        -- prefer the new one over the old.
-        -- However, we might have added some targets to the old unit
-        -- (see special target), so preserve those
-        unionCIs new_ci old_ci = new_ci { componentTargets = componentTargets new_ci ++ componentTargets old_ci }
-        mkMap = Map.fromListWith unionCIs . map (\ci -> (componentUnitId ci, ci))
-    let dfs = map componentDynFlags $ Map.elems cis
-        uids = Map.keys cis
-    logWith recorder Info $ LogMakingNewHscEnv uids
-    hscEnv' <- -- Set up a multi component session with the other units on GHC 9.4
-              Compat.initUnits dfs hsc_env
-
-    let closure_errs = checkHomeUnitsClosed' (hsc_unit_env hscEnv') (hsc_all_home_unit_ids hscEnv')
-        multi_errs = map (ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Warning) _cfp . T.pack . Compat.printWithoutUniques) closure_errs
-        bad_units = OS.fromList $ concat $ do
-            x <- bagToList $ mapBag errMsgDiagnostic $ unionManyBags $ map Compat.getMessages closure_errs
-            DriverHomePackagesNotClosed us <- pure x
-            pure us
-        isBad ci = (homeUnitId_ (componentDynFlags ci)) `OS.member` bad_units
-    -- Whenever we spin up a session on Linux, dynamically load libm.so.6
-    -- in. We need this in case the binary is statically linked, in which
-    -- case the interactive session will fail when trying to load
-    -- ghc-prim, which happens whenever Template Haskell is being
-    -- evaluated or haskell-language-server's eval plugin tries to run
-    -- some code. If the binary is dynamically linked, then this will have
-    -- no effect.
-    -- See https://github.com/haskell/haskell-language-server/issues/221
-    -- We need to do this after the call to setSessionDynFlags initialises
-    -- the loader
-    when (os == "linux") $ do
-      initObjLinker hscEnv'
-      res <- loadDLL hscEnv' "libm.so.6"
-      case res of
-        Nothing  -> pure ()
-        Just err -> logWith recorder Error $ LogDLLLoadError err
-
-    forM (Map.elems cis) $ \ci -> do
-      let df = componentDynFlags ci
-      thisEnv <- do
-            -- In GHC 9.4 we have multi component support, and we have initialised all the units
-            -- above.
-            -- We just need to set the current unit here
-            pure $ hscSetActiveUnitId (homeUnitId_ df) hscEnv'
-      henv <- newHscEnvEq thisEnv
-      let targetEnv = (if isBad ci then multi_errs else [], Just henv)
-          targetDepends = componentDependencyInfo ci
-      logWith recorder Debug $ LogNewComponentCache (targetEnv, targetDepends)
-      evaluate $ liftRnf rwhnf $ componentTargets ci
-
-      let mk t = fromTargetId (importPaths df) exts (targetId t) targetEnv targetDepends
-      ctargets <- concatMapM mk (componentTargets ci)
-
-      return (L.nubOrdOn targetTarget ctargets)
-
 {- Note [Avoiding bad interface files]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Originally, we set the cache directory for the various components once