Cleanup imports after CPP removal + few hlint fixes (haskell#4337)

soulomoon · Jun 27, 2024 · 147fb4a · 147fb4a
1 parent f523690
commit 147fb4a
Show file tree

Hide file tree

Showing 33 changed files with 136 additions and 194 deletions.
diff --git a/ghcide/session-loader/Development/IDE/Session.hs b/ghcide/session-loader/Development/IDE/Session.hs
@@ -100,14 +100,17 @@ import           Data.Foldable                       (for_)
 import           Data.HashMap.Strict                 (HashMap)
 import           Data.HashSet                        (HashSet)
 import qualified Data.HashSet                        as Set
+import qualified Data.Set                            as OS
 import           Database.SQLite.Simple
 import           Development.IDE.Core.Tracing        (withTrace)
 import           Development.IDE.Core.WorkerThread   (awaitRunInThread,
                                                       withWorkerQueue)
+import qualified Development.IDE.GHC.Compat.Util     as Compat
 import           Development.IDE.Session.Diagnostics (renderCradleError)
 import           Development.IDE.Types.Shake         (WithHieDb,
                                                       WithHieDbShield (..),
                                                       toNoFileKey)
+import           GHC.Data.Graph.Directed
 import           HieDb.Create
 import           HieDb.Types
 import           HieDb.Utils
@@ -116,13 +119,6 @@ import qualified System.Random                       as Random
 import           System.Random                       (RandomGen)
 import           Text.ParserCombinators.ReadP        (readP_to_S)
 
-
--- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
-
-import qualified Data.Set                            as OS
-import qualified Development.IDE.GHC.Compat.Util     as Compat
-import           GHC.Data.Graph.Directed
-
 import           GHC.Data.Bag
 import           GHC.Driver.Env                      (hsc_all_home_unit_ids)
 import           GHC.Driver.Errors.Types
@@ -832,7 +828,7 @@ checkHomeUnitsClosed' ue home_id_set
       where
         go rest this this_uis =
            plusUniqMap_C OS.union
-             (addToUniqMap_C OS.union external_depends this (OS.fromList $ this_deps))
+             (addToUniqMap_C OS.union external_depends this (OS.fromList this_deps))
              rest
            where
              external_depends = mapUniqMap (OS.fromList . unitDepends)
@@ -1154,7 +1150,7 @@ setOptions cfp (ComponentOptions theOpts compRoot _) dflags rootDir = do
                      -- This works because there won't be any dependencies on the
                      -- executable unit.
                      "main" ->
-                       let hash = B.unpack $ B16.encode $ H.finalize $ H.updates H.init (map B.pack $ this_opts)
+                       let hash = B.unpack $ B16.encode $ H.finalize $ H.updates H.init (map B.pack this_opts)
                            hashed_uid = Compat.toUnitId (Compat.stringToUnit ("main-"++hash))
                        in setHomeUnitId_ hashed_uid dflags'
                      _ -> dflags'

diff --git a/ghcide/src/Development/IDE/Core/Compile.hs b/ghcide/src/Development/IDE/Core/Compile.hs
@@ -39,71 +39,78 @@ module Development.IDE.Core.Compile
   ) where
 
 import           Control.Concurrent.Extra
-import           Control.Concurrent.STM.Stats      hiding (orElse)
-import           Control.DeepSeq                   (NFData (..), force, rnf)
-import           Control.Exception                 (evaluate)
+import           Control.Concurrent.STM.Stats           hiding (orElse)
+import           Control.DeepSeq                        (NFData (..), force,
+                                                         rnf)
+import           Control.Exception                      (evaluate)
 import           Control.Exception.Safe
-import           Control.Lens                      hiding (List, pre, (<.>))
+import           Control.Lens                           hiding (List, pre,
+                                                         (<.>))
 import           Control.Monad.Extra
 import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Except
-import qualified Control.Monad.Trans.State.Strict  as S
-import           Data.Aeson                        (toJSON)
-import           Data.Bifunctor                    (first, second)
+import qualified Control.Monad.Trans.State.Strict       as S
+import           Data.Aeson                             (toJSON)
+import           Data.Bifunctor                         (first, second)
 import           Data.Binary
-import qualified Data.ByteString                   as BS
+import qualified Data.ByteString                        as BS
 import           Data.Coerce
-import qualified Data.DList                        as DL
+import qualified Data.DList                             as DL
 import           Data.Functor
 import           Data.Generics.Aliases
 import           Data.Generics.Schemes
-import qualified Data.HashMap.Strict               as HashMap
-import           Data.IntMap                       (IntMap)
+import qualified Data.HashMap.Strict                    as HashMap
+import           Data.IntMap                            (IntMap)
 import           Data.IORef
 import           Data.List.Extra
-import qualified Data.Map.Strict                   as Map
+import qualified Data.Map.Strict                        as Map
 import           Data.Maybe
-import           Data.Proxy                        (Proxy (Proxy))
-import qualified Data.Text                         as T
-import           Data.Time                         (UTCTime (..))
-import           Data.Tuple.Extra                  (dupe)
+import           Data.Proxy                             (Proxy (Proxy))
+import qualified Data.Text                              as T
+import           Data.Time                              (UTCTime (..))
+import           Data.Tuple.Extra                       (dupe)
 import           Debug.Trace
-import           Development.IDE.Core.FileStore    (resetInterfaceStore)
+import           Development.IDE.Core.FileStore         (resetInterfaceStore)
 import           Development.IDE.Core.Preprocessor
+import           Development.IDE.Core.ProgressReporting (ProgressReporting (..),
+                                                         progressReportingOutsideState)
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Shake
-import           Development.IDE.Core.Tracing      (withTrace)
-import           Development.IDE.GHC.Compat        hiding (assert,
-                                                    loadInterface, parseHeader,
-                                                    parseModule, tcRnModule,
-                                                    writeHieFile)
-import qualified Development.IDE.GHC.Compat        as Compat
-import qualified Development.IDE.GHC.Compat        as GHC
-import qualified Development.IDE.GHC.Compat.Util   as Util
-import           Development.IDE.Core.ProgressReporting (ProgressReporting (..), progressReportingOutsideState)
+import           Development.IDE.Core.Tracing           (withTrace)
+import           Development.IDE.GHC.Compat             hiding (assert,
+                                                         loadInterface,
+                                                         parseHeader,
+                                                         parseModule,
+                                                         tcRnModule,
+                                                         writeHieFile)
+import qualified Development.IDE.GHC.Compat             as Compat
+import qualified Development.IDE.GHC.Compat             as GHC
+import qualified Development.IDE.GHC.Compat.Util        as Util
 import           Development.IDE.GHC.CoreFile
 import           Development.IDE.GHC.Error
-import           Development.IDE.GHC.Orphans       ()
+import           Development.IDE.GHC.Orphans            ()
 import           Development.IDE.GHC.Util
 import           Development.IDE.GHC.Warnings
 import           Development.IDE.Types.Diagnostics
 import           Development.IDE.Types.Location
 import           Development.IDE.Types.Options
-import           GHC                               (ForeignHValue,
-                                                    GetDocsFailure (..),
-                                                    parsedSource)
-import qualified GHC.LanguageExtensions            as LangExt
+import           GHC                                    (ForeignHValue,
+                                                         GetDocsFailure (..),
+                                                         parsedSource)
+import qualified GHC.LanguageExtensions                 as LangExt
 import           GHC.Serialized
-import           HieDb                             hiding (withHieDb)
-import qualified Language.LSP.Protocol.Message     as LSP
-import           Language.LSP.Protocol.Types       (DiagnosticTag (..))
-import qualified Language.LSP.Server               as LSP
-import           Prelude                           hiding (mod)
+import           HieDb                                  hiding (withHieDb)
+import qualified Language.LSP.Protocol.Message          as LSP
+import           Language.LSP.Protocol.Types            (DiagnosticTag (..))
+import qualified Language.LSP.Server                    as LSP
+import           Prelude                                hiding (mod)
 import           System.Directory
 import           System.FilePath
-import           System.IO.Extra                   (fixIO, newTempFileWithin)
+import           System.IO.Extra                        (fixIO,
+                                                         newTempFileWithin)
 
-import qualified GHC                               as G
+import qualified Data.Set                               as Set
+import qualified GHC                                    as G
 import           GHC.Tc.Gen.Splice
 import           GHC.Types.ForeignStubs
 import           GHC.Types.HpcInfo
@@ -112,18 +119,16 @@ import           GHC.Types.TypeEnv
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
 
 
-import qualified Data.Set                          as Set
-
 #if MIN_VERSION_ghc(9,5,0)
 import           GHC.Core.Lint.Interactive
 import           GHC.Driver.Config.CoreToStg.Prep
 #endif
 
 #if MIN_VERSION_ghc(9,7,0)
-import           Data.Foldable                     (toList)
+import           Data.Foldable                          (toList)
 import           GHC.Unit.Module.Warnings
 #else
-import           Development.IDE.Core.FileStore    (shareFilePath)
+import           Development.IDE.Core.FileStore         (shareFilePath)
 #endif
 
 --Simple constants to make sure the source is consistently named
@@ -292,7 +297,7 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
 
              {- load it -}
            ; (fv_hvs, lbss, pkgs) <- loadDecls (hscInterp hsc_env') hsc_env' srcspan bcos
-           ; let hval = ((expectJust "hscCompileCoreExpr'" $ lookup (idName binding_id) fv_hvs), lbss, pkgs)
+           ; let hval = (expectJust "hscCompileCoreExpr'" $ lookup (idName binding_id) fv_hvs, lbss, pkgs)
 
            ; modifyIORef' var (flip extendModuleEnvList [(mi_module $ hm_iface hm, linkableHash lb) | lb <- lbs, let hm = linkableHomeMod lb])
            ; return hval }

diff --git a/ghcide/src/Development/IDE/Core/Preprocessor.hs b/ghcide/src/Development/IDE/Core/Preprocessor.hs
@@ -28,13 +28,10 @@ import           Development.IDE.GHC.Error
 import           Development.IDE.Types.Diagnostics
 import           Development.IDE.Types.Location
 import qualified GHC.LanguageExtensions            as LangExt
+import           GHC.Utils.Logger                  (LogFlags (..))
 import           System.FilePath
 import           System.IO.Extra
 
--- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
-
-import           GHC.Utils.Logger                  (LogFlags (..))
-
 -- | Given a file and some contents, apply any necessary preprocessors,
 --   e.g. unlit/cpp. Return the resulting buffer and the DynFlags it implies.
 preprocessor :: HscEnv -> FilePath -> Maybe Util.StringBuffer -> ExceptT [FileDiagnostic] IO (Util.StringBuffer, [String], HscEnv, Util.Fingerprint)

diff --git a/ghcide/src/Development/IDE/Core/Rules.hs b/ghcide/src/Development/IDE/Core/Rules.hs
@@ -167,13 +167,8 @@ import           System.Directory                             (doesFileExist)
 import           System.Info.Extra                            (isWindows)
 
 
-import           GHC.Fingerprint
-
--- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
-
-
 import qualified Data.IntMap                                  as IM
-
+import           GHC.Fingerprint
 
 
 data Log

diff --git a/ghcide/src/Development/IDE/Core/Shake.hs b/ghcide/src/Development/IDE/Core/Shake.hs
@@ -126,6 +126,7 @@ import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Tracing
 import           Development.IDE.Core.WorkerThread
 import           Development.IDE.GHC.Compat             (NameCache,
+                                                         NameCacheUpdater,
                                                          initNameCache,
                                                          knownKeyNames)
 import           Development.IDE.GHC.Orphans            ()
@@ -174,10 +175,6 @@ import           System.FilePath                        hiding (makeRelative)
 import           System.IO.Unsafe                       (unsafePerformIO)
 import           System.Time.Extra
 
--- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
-
-
-import           Development.IDE.GHC.Compat             (NameCacheUpdater)
 
 data Log
   = LogCreateHieDbExportsMapStart

diff --git a/ghcide/src/Development/IDE/Core/Tracing.hs b/ghcide/src/Development/IDE/Core/Tracing.hs
@@ -61,7 +61,7 @@ withTelemetryRecorder k = withSpan "Logger" $ \sp ->
 -- | Returns a logger that produces telemetry events in a single span.
 telemetryLogRecorder :: SpanInFlight -> Recorder (WithPriority (Doc a))
 telemetryLogRecorder sp = Recorder $ \WithPriority {..} ->
-  liftIO $ addEvent sp (fromString $ show priority) (encodeUtf8 $ trim $ renderStrict $ layoutCompact $ payload)
+  liftIO $ addEvent sp (fromString $ show priority) (encodeUtf8 $ trim $ renderStrict $ layoutCompact payload)
   where
     -- eventlog message size is limited by EVENT_PAYLOAD_SIZE_MAX = STG_WORD16_MAX
     trim = T.take (fromIntegral(maxBound :: Word16) - 10)

diff --git a/ghcide/src/Development/IDE/GHC/CPP.hs b/ghcide/src/Development/IDE/GHC/CPP.hs
@@ -22,7 +22,6 @@ import           GHC.Settings
 
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
 
-
 #if !MIN_VERSION_ghc(9,5,0)
 import qualified GHC.Driver.Pipeline.Execute     as Pipeline
 #endif

diff --git a/ghcide/src/Development/IDE/GHC/Compat.hs b/ghcide/src/Development/IDE/GHC/Compat.hs
@@ -169,6 +169,7 @@ import           GHC.Builtin.Uniques
 import           GHC.ByteCode.Types
 import           GHC.CoreToStg
 import           GHC.Data.Maybe
+import           GHC.Driver.Config.Stg.Pipeline
 import           GHC.Driver.Env                          as Env
 import           GHC.Iface.Env
 import           GHC.Linker.Loader                       (loadDecls, loadExpr)
@@ -181,15 +182,12 @@ import           GHC.Types.IPE
 import           GHC.Types.SrcLoc                        (combineRealSrcSpans)
 import           GHC.Unit.Home.ModInfo                   (HomePackageTable,
                                                           lookupHpt)
+import           GHC.Unit.Module.Deps                    (Dependencies (dep_direct_mods),
+                                                          Usage (..))
 import           GHC.Unit.Module.ModIface
 
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
 
-
-import           GHC.Driver.Config.Stg.Pipeline
-import           GHC.Unit.Module.Deps                    (Dependencies (dep_direct_mods),
-                                                          Usage (..))
-
 #if !MIN_VERSION_ghc(9,5,0)
 import           GHC.Core.Lint                           (lintInteractiveExpr)
 #endif

diff --git a/ghcide/src/Development/IDE/GHC/Compat/Core.hs b/ghcide/src/Development/IDE/GHC/Compat/Core.hs
@@ -487,12 +487,15 @@ import qualified GHC.Utils.Panic.Plain       as Plain
 import           Data.Foldable               (toList)
 import           GHC.Core.Multiplicity       (scaledThing)
 import           GHC.Data.Bag
+import qualified GHC.Data.Strict             as Strict
+import qualified GHC.Driver.Config.Finder    as GHC
+import qualified GHC.Driver.Config.Tidy      as GHC
 import           GHC.Driver.Env
-import           GHC.Hs                       (HsModule (..))
-#if !MIN_VERSION_ghc(9,9,0)
-import           GHC.Hs                       (SrcSpanAnn')
-#endif
-import           GHC.Hs.Decls                 hiding (FunDep)
+import           GHC.Driver.Env              as GHCi
+import           GHC.Driver.Env.KnotVars
+import           GHC.Driver.Errors.Types
+import           GHC.Hs                      (HsModule (..))
+import           GHC.Hs.Decls                hiding (FunDep)
 import           GHC.Hs.Doc
 import           GHC.Hs.Expr
 import           GHC.Hs.Extension
@@ -516,39 +519,36 @@ import           GHC.Types.SourceText
 import           GHC.Types.Target            (Target (..), TargetId (..))
 import           GHC.Types.TyThing
 import           GHC.Types.TyThing.Ppr
+import           GHC.Types.Unique
+import           GHC.Types.Unique.Map
+import           GHC.Unit.Env
 import           GHC.Unit.Finder             hiding (mkHomeModLocation)
+import qualified GHC.Unit.Finder             as GHC
+import           GHC.Unit.Finder.Types
 import           GHC.Unit.Home.ModInfo
+import           GHC.Unit.Module.Graph
 import           GHC.Unit.Module.Imported
 import           GHC.Unit.Module.ModDetails
 import           GHC.Unit.Module.ModGuts
 import           GHC.Unit.Module.ModIface    (IfaceExport, ModIface,
                                               ModIface_ (..), mi_fix)
 import           GHC.Unit.Module.ModSummary  (ModSummary (..))
+import           GHC.Utils.Error             (mkPlainErrorMsgEnvelope)
+import           GHC.Utils.Panic
+import           GHC.Utils.TmpFs
 import           Language.Haskell.Syntax     hiding (FunDep)
 
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
 
 
-import qualified GHC.Data.Strict             as Strict
-import qualified GHC.Driver.Config.Finder    as GHC
-import qualified GHC.Driver.Config.Tidy      as GHC
-import           GHC.Driver.Env              as GHCi
-import           GHC.Driver.Env.KnotVars
-import           GHC.Driver.Errors.Types
-import           GHC.Types.Unique
-import           GHC.Types.Unique.Map
-import           GHC.Unit.Env
-import qualified GHC.Unit.Finder             as GHC
-import           GHC.Unit.Finder.Types
-import           GHC.Unit.Module.Graph
-import           GHC.Utils.Error             (mkPlainErrorMsgEnvelope)
-import           GHC.Utils.Panic
-import           GHC.Utils.TmpFs
-
 #if !MIN_VERSION_ghc(9,7,0)
 import           GHC.Types.Avail             (greNamePrintableName)
 #endif
 
+#if !MIN_VERSION_ghc(9,9,0)
+import           GHC.Hs                      (SrcSpanAnn')
+#endif
+
 mkHomeModLocation :: DynFlags -> ModuleName -> FilePath -> IO Module.ModLocation
 mkHomeModLocation df mn f = pure $ GHC.mkHomeModLocation (GHC.initFinderOpts df) mn f
 

diff --git a/ghcide/src/Development/IDE/GHC/Compat/Env.hs b/ghcide/src/Development/IDE/GHC/Compat/Env.hs
@@ -57,6 +57,7 @@ module Development.IDE.GHC.Compat.Env (
 import           GHC                 (setInteractiveDynFlags)
 
 import           GHC.Driver.Backend  as Backend
+import           GHC.Driver.Env      (HscEnv, hscSetActiveUnitId)
 import qualified GHC.Driver.Env      as Env
 import           GHC.Driver.Hooks    (Hooks)
 import           GHC.Driver.Session
@@ -69,12 +70,6 @@ import           GHC.Unit.Types      (UnitId)
 import           GHC.Utils.Logger
 import           GHC.Utils.TmpFs
 
--- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
-
-
-import           GHC.Driver.Env      (HscEnv, hscSetActiveUnitId)
-
-
 
 hsc_EPS :: HscEnv -> UnitEnv
 hsc_EPS = Env.hsc_unit_env

diff --git a/ghcide/src/Development/IDE/GHC/Compat/Iface.hs b/ghcide/src/Development/IDE/GHC/Compat/Iface.hs
@@ -9,13 +9,12 @@ module Development.IDE.GHC.Compat.Iface (
 import           Development.IDE.GHC.Compat.Env
 import           Development.IDE.GHC.Compat.Outputable
 import           GHC
+import           GHC.Driver.Session                    (targetProfile)
 import qualified GHC.Iface.Load                        as Iface
 import           GHC.Unit.Finder.Types                 (FindResult)
 
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
 
-import           GHC.Driver.Session                    (targetProfile)
-
 #if MIN_VERSION_ghc(9,7,0)
 import           GHC.Iface.Errors.Ppr                  (missingInterfaceErrorDiagnostic)
 import           GHC.Iface.Errors.Types                (IfaceMessage)