Simplify initPlugins

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

@@ -69,7 +69,7 @@
 import           Data.Time                              (UTCTime (..))
 import           Data.Tuple.Extra                       (dupe)
 import           Debug.Trace
 import           Development.IDE.Core.FileStore         (resetInterfaceStore)
 import           Development.IDE.Core.Preprocessor
 import           Development.IDE.Core.ProgressReporting (progressUpdate)
 import           Development.IDE.Core.RuleTypes
@@ -109,6 +109,7 @@
 
 import qualified Data.Set                               as Set
 import qualified GHC                                    as G
+import qualified GHC.Runtime.Loader                as Loader
 import           GHC.Tc.Gen.Splice
 import           GHC.Types.ForeignStubs
 import           GHC.Types.HpcInfo
@@ -174,15 +175,15 @@
         let modSummary = pm_mod_summary pm
             dflags = ms_hspp_opts modSummary
         initialized <- catchSrcErrors (hsc_dflags hsc) "typecheck (initialize plugins)"
-                                      (initPlugins hsc modSummary)
+                                      (Loader.initializePlugins (hscSetFlags (ms_hspp_opts modSummary) hsc))
         case initialized of
           Left errs -> return (errs, Nothing)
-          Right (modSummary', hscEnv) -> do
+          Right hscEnv -> do
             (warnings, etcm) <- withWarnings sourceTypecheck $ \tweak ->
                 let
                   session = tweak (hscSetFlags dflags hscEnv)
                    -- TODO: maybe settings ms_hspp_opts is unnecessary?
-                  mod_summary'' = modSummary' { ms_hspp_opts = hsc_dflags session}
+                  mod_summary'' = modSummary { ms_hspp_opts = hsc_dflags session}
                 in
                   catchSrcErrors (hsc_dflags hscEnv) sourceTypecheck $ do
                     tcRnModule session tc_helpers $ demoteIfDefer pm{pm_mod_summary = mod_summary''}
@@ -956,7 +957,7 @@
 
 
         convImport (L _ i) = (
                                (ideclPkgQual i)
                              , reLoc $ ideclName i)
 
         msrImports = implicit_imports ++ imps
@@ -981,7 +982,7 @@
 
     let modl = mkHomeModule (hscHomeUnit ppEnv) mod
         sourceType = if "-boot" `isSuffixOf` takeExtension fp then HsBootFile else HsSrcFile
-        msrModSummary2 =
+        msrModSummary =
             ModSummary
                 { ms_mod          = modl
                 , ms_hie_date     = Nothing
@@ -1002,8 +1003,8 @@
                 , ms_textual_imps = textualImports
                 }
 
-    msrFingerprint <- liftIO $ computeFingerprint opts msrModSummary2
-    (msrModSummary, msrHscEnv) <- liftIO $ initPlugins ppEnv msrModSummary2
+    msrFingerprint <- liftIO $ computeFingerprint opts msrModSummary
+    msrHscEnv <- liftIO $ Loader.initializePlugins (hscSetFlags (ms_hspp_opts msrModSummary) ppEnv)
     return ModSummaryResult{..}
     where
         -- Compute a fingerprint from the contents of `ModSummary`,

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

@@ -28,6 +28,7 @@ import           Development.IDE.GHC.Error
 import           Development.IDE.Types.Diagnostics
 import           Development.IDE.Types.Location
 import qualified GHC.LanguageExtensions            as LangExt
+import qualified GHC.Runtime.Loader                as Loader
 import           GHC.Utils.Logger                  (LogFlags (..))
 import           System.FilePath
 import           System.IO.Extra
@@ -149,7 +150,7 @@ parsePragmasIntoHscEnv env fp contents = catchSrcErrors dflags0 "pragmas" $ do
     evaluate $ rnf opts
 
     (dflags, _, _) <- parseDynamicFilePragma dflags0 opts
-    hsc_env' <- initializePlugins (hscSetFlags dflags env)
+    hsc_env' <- Loader.initializePlugins (hscSetFlags dflags env)
     return (map unLoc opts, hscSetFlags (disableWarningsAsErrors $ hsc_dflags hsc_env') hsc_env')
   where dflags0 = hsc_dflags env
 

ghcide/src/Development/IDE/GHC/Compat/Plugins.hs

@@ -7,8 +7,6 @@ module Development.IDE.GHC.Compat.Plugins (
     defaultPlugin,
     PluginWithArgs(..),
     applyPluginsParsedResultAction,
-    initializePlugins,
-    initPlugins,
 
     -- * Static plugins
     StaticPlugin(..),
@@ -20,7 +18,6 @@ module Development.IDE.GHC.Compat.Plugins (
     ) where
 
 import           Development.IDE.GHC.Compat.Core
-import           Development.IDE.GHC.Compat.Env    (hscSetFlags, hsc_dflags)
 import           Development.IDE.GHC.Compat.Parser as Parser
 
 import qualified GHC.Driver.Env                    as Env
@@ -32,7 +29,6 @@ import           GHC.Driver.Plugins                (ParsedResult (..),
                                                     defaultPlugin,
                                                     staticPlugins, withPlugins)
 import qualified GHC.Parser.Lexer                  as Lexer
-import qualified GHC.Runtime.Loader                as Loader
 
 
 getPsMessages :: PState -> PsMessages
@@ -48,16 +44,6 @@ applyPluginsParsedResultAction env ms parsed msgs = do
       applyPluginAction
       (ParsedResult (HsParsedModule parsed []) msgs)
 
-initializePlugins :: HscEnv -> IO HscEnv
-initializePlugins env = do
-    Loader.initializePlugins env
-
--- | Plugins aren't stored in ModSummary anymore since GHC 9.2, but this
--- function still returns it for compatibility with 8.10
-initPlugins :: HscEnv -> ModSummary -> IO (ModSummary, HscEnv)
-initPlugins session modSummary = do
-    session1 <- initializePlugins (hscSetFlags (ms_hspp_opts modSummary) session)
-    return (modSummary{ms_hspp_opts = hsc_dflags session1}, session1)
 
 hsc_static_plugins :: HscEnv -> [StaticPlugin]
 hsc_static_plugins = staticPlugins . Env.hsc_plugins

plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs

@@ -44,6 +44,7 @@ import           Development.IDE.GHC.Compat.ExactPrint
 import qualified Development.IDE.GHC.Compat.Util       as Util
 import           Development.IDE.GHC.ExactPrint
 import           GHC.Exts
+import qualified GHC.Runtime.Loader                as Loader
 import qualified GHC.Types.Error                       as Error
 import           Ide.Plugin.Error                      (PluginError (PluginInternalError))
 import           Ide.Plugin.Splice.Types
@@ -232,7 +233,7 @@ setupDynFlagsForGHCiLike env dflags = do
                 `gopt_set` Opt_IgnoreOptimChanges
                 `gopt_set` Opt_IgnoreHpcChanges
                 `gopt_unset` Opt_DiagnosticsShowCaret
-    initializePlugins (hscSetFlags dflags4 env)
+    Loader.initializePlugins (hscSetFlags dflags4 env)
 
 adjustToRange :: Uri -> Range -> WorkspaceEdit -> WorkspaceEdit
 adjustToRange uri ran (WorkspaceEdit mhult mlt x) =