ghcide 1.4.2.0 → 1.4.2.1

raw patch · 50 files changed

+3292/−1259 lines, 50 filesdep +monoid-subclassesdep +vector-algorithmsdep −ghc-api-compatdep ~hiedbPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: monoid-subclasses, vector-algorithms

Dependencies removed: ghc-api-compat

Dependency ranges changed: hiedb

API changes (from Hackage documentation)

Files

• ghcide.cabal +41/−19
• session-loader/Development/IDE/Session.hs +35/−50
• src/Development/IDE/Core/Actions.hs +4/−9
• src/Development/IDE/Core/Compile.hs +76/−118
• src/Development/IDE/Core/Preprocessor.hs +48/−45
• src/Development/IDE/Core/RuleTypes.hs +1/−7
• src/Development/IDE/Core/Rules.hs +27/−29
• src/Development/IDE/Core/Shake.hs +5/−4
• src/Development/IDE/Core/Tracing.hs +2/−0
• src/Development/IDE/Core/UseStale.hs +4/−3
• src/Development/IDE/GHC/CPP.hs +21/−187
• src/Development/IDE/GHC/Compat.hs +109/−407
• src/Development/IDE/GHC/Compat/CPP.hs +204/−0
• src/Development/IDE/GHC/Compat/Core.hs +848/−0
• src/Development/IDE/GHC/Compat/Env.hs +284/−0
• src/Development/IDE/GHC/Compat/Iface.hs +41/−0
• src/Development/IDE/GHC/Compat/Logger.hs +56/−0
• src/Development/IDE/GHC/Compat/Outputable.hs +165/−0
• src/Development/IDE/GHC/Compat/Parser.hs +117/−0
• src/Development/IDE/GHC/Compat/Plugins.hs +73/−0
• src/Development/IDE/GHC/Compat/Units.hs +345/−0
• src/Development/IDE/GHC/Compat/Util.hs +110/−0
• src/Development/IDE/GHC/Error.hs +27/−37
• src/Development/IDE/GHC/ExactPrint.hs +19/−12
• src/Development/IDE/GHC/Orphans.hs +25/−9
• src/Development/IDE/GHC/Util.hs +71/−51
• src/Development/IDE/GHC/Warnings.hs +8/−8
• src/Development/IDE/Import/FindImports.hs +24/−28
• src/Development/IDE/LSP/Outline.hs +18/−20
• src/Development/IDE/Plugin/CodeAction.hs +12/−27
• src/Development/IDE/Plugin/CodeAction/ExactPrint.hs +3/−7
• src/Development/IDE/Plugin/Completions.hs +10/−9
• src/Development/IDE/Plugin/Completions/Logic.hs +28/−34
• src/Development/IDE/Plugin/Completions/Types.hs +6/−3
• src/Development/IDE/Plugin/Test.hs +1/−3
• src/Development/IDE/Plugin/TypeLenses.hs +4/−23
• src/Development/IDE/Spans/AtPoint.hs +26/−25
• src/Development/IDE/Spans/Common.hs +5/−16
• src/Development/IDE/Spans/Documentation.hs +12/−19
• src/Development/IDE/Spans/LocalBindings.hs +5/−4
• src/Development/IDE/Types/Exports.hs +9/−8
• src/Development/IDE/Types/HscEnvEq.hs +30/−34
• src/Development/IDE/Types/Location.hs +7/−1
• src/Development/IDE/Types/Options.hs +2/−2
• src/Text/Fuzzy/Parallel.hs +105/−0
• test/data/cabal-exe/dist-newstyle/build/x86_64-osx/ghc-8.10.3/a-0.1.0.0/x/a/build/a/autogen/Paths_a.hs +50/−0
• test/data/multi/dist-newstyle/build/x86_64-osx/ghc-8.10.2/a-1.0.0/build/autogen/Paths_a.hs +50/−0
• test/data/multi/dist-newstyle/build/x86_64-osx/ghc-8.10.3/a-1.0.0/build/autogen/Paths_a.hs +50/−0
• test/data/multi/dist-newstyle/build/x86_64-osx/ghc-8.10.3/b-1.0.0/build/autogen/Paths_b.hs +50/−0
• test/exe/Main.hs +19/−1

@@ -2,7 +2,7 @@ build-type:         Simple category:           Development name:               ghcide-version:            1.4.2.0+version:            1.4.2.1 license:            Apache-2.0 license-file:       LICENSE author:             Digital Asset and Ghcide contributors@@ -13,7 +13,7 @@     A library for building Haskell IDE's on top of the GHC API. homepage:           https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme bug-reports:        https://github.com/haskell/haskell-language-server/issues-tested-with:        GHC == 8.6.4 || == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1+tested-with:        GHC == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1 extra-source-files: README.md CHANGELOG.md                     test/data/**/*.project                     test/data/**/*.cabal@@ -61,9 +61,10 @@         hie-compat ^>= 0.2.0.0,         hls-plugin-api ^>= 1.2.0.0,         lens,-        hiedb == 0.4.0.*,+        hiedb == 0.4.1.*,         lsp-types >= 1.3.0.1 && < 1.4,         lsp == 1.2.*,+        monoid-subclasses,         mtl,         network-uri,         optparse-applicative,@@ -86,6 +87,7 @@         unordered-containers >= 0.2.10.0,         utf8-string,         vector,+        vector-algorithms,         hslogger,         Diff ^>=0.4.0,         vector,@@ -110,22 +112,6 @@       build-depends:         unix -    if impl(ghc < 8.10.5)-        build-depends:-            ghc-api-compat ==8.6-    elif impl(ghc == 8.10.5)-        build-depends:-            ghc-api-compat ==8.10.5-    elif impl(ghc == 8.10.6)-        build-depends:-            ghc-api-compat ==8.10.6-    elif impl(ghc == 8.10.7)-        build-depends:-            ghc-api-compat ==8.10.7-    elif impl(ghc == 9.0.1)-        build-depends:-            ghc-api-compat ==9.0.1-     default-extensions:         ApplicativeDo         BangPatterns@@ -171,6 +157,15 @@         Development.IDE.Core.Tracing         Development.IDE.Core.UseStale         Development.IDE.GHC.Compat+        Development.IDE.GHC.Compat.Core+        Development.IDE.GHC.Compat.Env+        Development.IDE.GHC.Compat.Iface+        Development.IDE.GHC.Compat.Logger+        Development.IDE.GHC.Compat.Outputable+        Development.IDE.GHC.Compat.Parser+        Development.IDE.GHC.Compat.Plugins+        Development.IDE.GHC.Compat.Units+        Development.IDE.GHC.Compat.Util         Development.IDE.Core.Compile         Development.IDE.GHC.Error         Development.IDE.GHC.ExactPrint@@ -215,11 +210,21 @@         Development.IDE.Plugin.Completions.Logic         Development.IDE.Session.VersionCheck         Development.IDE.Types.Action+        Text.Fuzzy.Parallel+     ghc-options: -Wall -Wno-name-shadowing -Wincomplete-uni-patterns -Wno-unticked-promoted-constructors      if flag(ghc-patched-unboxed-bytecode)       cpp-options: -DGHC_PATCHED_UNBOXED_BYTECODE +    if impl(ghc < 8.10)+      exposed-modules:+        Development.IDE.GHC.Compat.CPP++flag test-exe+    description: Build the ghcide-test-preprocessor executable+    default: True+ executable ghcide-test-preprocessor     default-language: Haskell2010     hs-source-dirs: test/preprocessor@@ -228,6 +233,9 @@     build-depends:         base == 4.* +    if !flag(test-exe)+        buildable: False+ benchmark benchHist     type: exitcode-stdio-1.0     default-language: Haskell2010@@ -266,6 +274,10 @@         text,         yaml +flag executable+    description: Build the ghcide executable+    default: True+ executable ghcide     default-language:   Haskell2010     hs-source-dirs:     exe@@ -325,6 +337,9 @@         TypeApplications         ViewPatterns +    if !flag(executable)+        buildable: False+ test-suite ghcide-tests     type: exitcode-stdio-1.0     default-language: Haskell2010@@ -407,6 +422,10 @@         TypeApplications         ViewPatterns +flag bench-exe+    description: Build the ghcide-bench executable+    default: True+ executable ghcide-bench     default-language: Haskell2010     build-tool-depends:@@ -451,3 +470,6 @@         TupleSections         TypeApplications         ViewPatterns++    if !flag(bench-exe)+        buildable: False

@@ -19,7 +19,7 @@  import           Control.Concurrent.Async import           Control.Concurrent.Strict-import           Control.Exception.Safe+import           Control.Exception.Safe               as Safe import           Control.Monad import           Control.Monad.Extra import           Control.Monad.IO.Class@@ -42,9 +42,13 @@ import           Data.Version import           Development.IDE.Core.RuleTypes import           Development.IDE.Core.Shake-import           Development.IDE.GHC.Compat           hiding (Target,-                                                       TargetFile, TargetModule)-import qualified Development.IDE.GHC.Compat           as GHC+import qualified Development.IDE.GHC.Compat           as Compat+import           Development.IDE.GHC.Compat.Core      hiding (Target,+                                                       TargetFile, TargetModule,+                                                       Var)+import qualified Development.IDE.GHC.Compat.Core      as GHC+import           Development.IDE.GHC.Compat.Env       hiding (Logger)+import           Development.IDE.GHC.Compat.Units     (UnitId) import           Development.IDE.GHC.Util import           Development.IDE.Graph                (Action) import           Development.IDE.Session.VersionCheck@@ -71,12 +75,6 @@ import           Control.Applicative                  (Alternative ((<|>))) import           Control.Exception                    (evaluate) import           Data.Void-import           GHCi-import           HscTypes                             (hsc_IC, hsc_NC,-                                                       hsc_dflags, ic_dflags)-import           Linker-import           Module-import           NameCache  import           Control.Concurrent.STM               (atomically) import           Control.Concurrent.STM.TQueue@@ -105,7 +103,7 @@   , getCacheDirs           :: String -> [String] -> IO CacheDirs   -- | Return the GHC lib dir to use for the 'unsafeGlobalDynFlags'   , getInitialGhcLibDir    :: FilePath -> IO (Maybe LibDir)-  , fakeUid                :: GHC.InstalledUnitId+  , fakeUid                :: UnitId     -- ^ unit id used to tag the internal component built by ghcide     --   To reuse external interface files the unit ids must match,     --   thus make sure to build them with `--this-unit-id` set to the@@ -118,7 +116,7 @@         ,loadCradle = loadWithImplicitCradle         ,getCacheDirs = getCacheDirsDefault         ,getInitialGhcLibDir = getInitialGhcLibDirDefault-        ,fakeUid = GHC.toInstalledUnitId (GHC.stringToUnit "main")+        ,fakeUid = Compat.toUnitId (Compat.stringToUnit "main")         }  -- | Find the cradle for a given 'hie.yaml' configuration.@@ -173,7 +171,7 @@ runWithDb fp k = do   -- Delete the database if it has an incompatible schema version   withHieDb fp (const $ pure ())-    `catch` \IncompatibleSchemaVersion{} -> removeFile fp+    `Safe.catch` \IncompatibleSchemaVersion{} -> removeFile fp   withHieDb fp $ \writedb -> do     initConn writedb     chan <- newTQueueIO@@ -187,15 +185,15 @@       forever $ do         k <- atomically $ readTQueue chan         k db-          `catch` \e@SQLError{} -> do+          `Safe.catch` \e@SQLError{} -> do             hPutStrLn stderr $ "SQLite error in worker, ignoring: " ++ show e-          `catchAny` \e -> do+          `Safe.catchAny` \e -> do             hPutStrLn stderr $ "Uncaught error in database worker, ignoring: " ++ show e   getHieDbLoc :: FilePath -> IO FilePath getHieDbLoc dir = do-  let db = intercalate "-" [dirHash, takeBaseName dir, ghcVersionStr, hiedbDataVersion] <.> "hiedb"+  let db = intercalate "-" [dirHash, takeBaseName dir, Compat.ghcVersionStr, hiedbDataVersion] <.> "hiedb"       dirHash = B.unpack $ B16.encode $ H.hash $ B.pack dir   cDir <- IO.getXdgDirectory IO.XdgCache cacheDir   createDirectoryIfMissing True cDir@@ -297,7 +295,7 @@                   -- We will modify the unitId and DynFlags used for                   -- compilation but these are the true source of                   -- information.-                  new_deps = RawComponentInfo (thisInstalledUnitId df) df targets cfp opts dep_info+                  new_deps = RawComponentInfo (homeUnitId_ df) df targets cfp opts dep_info                                 : maybe [] snd oldDeps                   -- Get all the unit-ids for things in this component                   inplace = map rawComponentUnitId new_deps@@ -482,7 +480,7 @@             ncfp <- toNormalizedFilePath' <$> canonicalizePath file             cachedHieYamlLocation <- HM.lookup ncfp <$> readVar filesMap             hieYaml <- cradleLoc file-            sessionOpts (join cachedHieYamlLocation <|> hieYaml, file) `catch` \e ->+            sessionOpts (join cachedHieYamlLocation <|> hieYaml, file) `Safe.catch` \e ->                 return (([renderPackageSetupException file e], Nothing), maybe [] pure hieYaml)      returnWithVersion $ \file -> do@@ -522,11 +520,11 @@ emptyHscEnv :: IORef NameCache -> FilePath -> IO HscEnv emptyHscEnv nc libDir = do     env <- runGhc (Just libDir) getSession-    when (ghcVersion < GHC90) $+    when (Compat.ghcVersion < Compat.GHC90) $         -- This causes ghc9 to crash with the error:         -- Couldn't find a target code interpreter. Try with -fexternal-interpreter         initDynLinker env-    pure $ setNameCache nc env{ hsc_dflags = (hsc_dflags env){useUnicode = True } }+    pure $ setNameCache nc (hscSetFlags ((hsc_dflags env){useUnicode = True }) env)  data TargetDetails = TargetDetails   {@@ -571,13 +569,13 @@          -> Maybe FilePath -- Path to cradle          -> NormalizedFilePath -- Path to file that caused the creation of this component          -> HscEnv-         -> [(InstalledUnitId, DynFlags)]+         -> [(UnitId, DynFlags)]          -> ComponentInfo          -> IO ( [TargetDetails], (IdeResult HscEnvEq, DependencyInfo)) newComponentCache logger exts cradlePath cfp hsc_env uids ci = do     let df = componentDynFlags ci-    let hscEnv' = hsc_env { hsc_dflags = df-                          , hsc_IC = (hsc_IC hsc_env) { ic_dflags = df } }+    let hscEnv' = hscSetFlags df hsc_env+                          { hsc_IC = (hsc_IC hsc_env) { ic_dflags = df } }      let newFunc = maybe newHscEnvEqPreserveImportPaths newHscEnvEq cradlePath     henv <- newFunc hscEnv' uids@@ -676,7 +674,7 @@  -- This is pristine information about a component data RawComponentInfo = RawComponentInfo-  { rawComponentUnitId         :: InstalledUnitId+  { rawComponentUnitId         :: UnitId   -- | Unprocessed DynFlags. Contains inplace packages such as libraries.   -- We do not want to use them unprocessed.   , rawComponentDynFlags       :: DynFlags@@ -693,14 +691,14 @@  -- This is processed information about the component, in particular the dynflags will be modified. data ComponentInfo = ComponentInfo-  { componentUnitId         :: InstalledUnitId+  { componentUnitId         :: UnitId   -- | Processed DynFlags. Does not contain inplace packages such as local   -- libraries. Can be used to actually load this Component.   , componentDynFlags       :: DynFlags   -- | Internal units, such as local libraries, that this component   -- is loaded with. These have been extracted from the original   -- ComponentOptions.-  , _componentInternalUnits :: [InstalledUnitId]+  , _componentInternalUnits :: [UnitId]   -- | All targets of this components.   , componentTargets        :: [GHC.Target]   -- | Filepath which caused the creation of this component@@ -733,7 +731,7 @@    where     tryIO :: IO a -> IO (Either IOException a)-    tryIO = try+    tryIO = Safe.try      do_one :: FilePath -> IO (FilePath, Maybe UTCTime)     do_one fp = (fp,) . eitherToMaybe <$> tryIO (getModificationTime fp)@@ -747,18 +745,14 @@ -- tcRnImports) which assume that all modules in the HPT have the same unit -- ID. Therefore we create a fake one and give them all the same unit id. removeInplacePackages-    :: InstalledUnitId     -- ^ fake uid to use for our internal component-    -> [InstalledUnitId]+    :: UnitId     -- ^ fake uid to use for our internal component+    -> [UnitId]     -> DynFlags-    -> (DynFlags, [InstalledUnitId])-removeInplacePackages fake_uid us df = (setThisInstalledUnitId fake_uid $+    -> (DynFlags, [UnitId])+removeInplacePackages fake_uid us df = (setHomeUnitId_ fake_uid $                                        df { packageFlags = ps }, uids)   where-    (uids, ps) = partitionEithers (map go (packageFlags df))-    go p@(ExposePackage _ (UnitIdArg u) _) = if GHC.toInstalledUnitId u `elem` us-                                                  then Left (GHC.toInstalledUnitId u)-                                                  else Right p-    go p = Right p+    (uids, ps) = Compat.filterInplaceUnits us (packageFlags df)  -- | Memoize an IO function, with the characteristics: --@@ -790,25 +784,16 @@           -- also, it can confuse the interface stale check           dontWriteHieFiles $           setIgnoreInterfacePragmas $-          setLinkerOptions $+          setBytecodeLinkerOptions $           disableOptimisation $-          setUpTypedHoles $+          Compat.setUpTypedHoles $           makeDynFlagsAbsolute compRoot dflags'     -- initPackages parses the -package flags and     -- sets up the visibility for each component.     -- Throws if a -package flag cannot be satisfied.-    final_df <- liftIO $ wrapPackageSetupException $ initUnits dflags''-    return (final_df, targets)---- we don't want to generate object code so we compile to bytecode--- (HscInterpreted) which implies LinkInMemory--- HscInterpreted-setLinkerOptions :: DynFlags -> DynFlags-setLinkerOptions df = df {-    ghcLink   = LinkInMemory-  , hscTarget = HscNothing-  , ghcMode = CompManager-  }+    env <- hscSetFlags dflags'' <$> getSession+    final_env' <- liftIO $ wrapPackageSetupException $ Compat.initUnits env+    return (hsc_dflags final_env', targets)  setIgnoreInterfacePragmas :: DynFlags -> DynFlags setIgnoreInterfacePragmas df =

@@ -23,17 +23,12 @@ import           Development.IDE.Core.RuleTypes import           Development.IDE.Core.Service import           Development.IDE.Core.Shake-import           Development.IDE.GHC.Compat           hiding (TargetFile,-                                                       TargetModule,-                                                       parseModule,-                                                       typecheckModule,-                                                       writeHieFile)+import           Development.IDE.GHC.Compat           hiding (writeHieFile) import           Development.IDE.Graph import qualified Development.IDE.Spans.AtPoint        as AtPoint import           Development.IDE.Types.HscEnvEq       (hscEnv) import           Development.IDE.Types.Location import qualified HieDb-import           HscTypes                             (hsc_dflags) import           Language.LSP.Types                   (DocumentHighlight (..),                                                        SymbolInformation (..)) @@ -44,7 +39,7 @@   :: HieDbWriter -- ^ access the database   -> FilePath -- ^ The `.hie` file we got from the database   -> ModuleName-  -> UnitId+  -> Unit   -> Bool -- ^ Is this file a boot file?   -> MaybeT IdeAction Uri lookupMod _dbchan _hie_f _mod _uid _boot = MaybeT $ pure Nothing@@ -64,11 +59,11 @@   opts <- liftIO $ getIdeOptionsIO ide    (hf, mapping) <- useE GetHieAst file-  df <- hsc_dflags . hscEnv . fst <$> useE GhcSession file+  env <- hscEnv . fst <$> useE GhcSession file   dkMap <- lift $ maybe (DKMap mempty mempty) fst <$> runMaybeT (useE GetDocMap file)    !pos' <- MaybeT (return $ fromCurrentPosition mapping pos)-  MaybeT $ pure $ first (toCurrentRange mapping =<<) <$> AtPoint.atPoint opts hf dkMap df pos'+  MaybeT $ pure $ first (toCurrentRange mapping =<<) <$> AtPoint.atPoint opts hf dkMap env pos'  toCurrentLocations :: PositionMapping -> [Location] -> [Location] toCurrentLocations mapping = mapMaybe go

@@ -43,19 +43,18 @@ import           Development.IDE.Types.Diagnostics import           Development.IDE.Types.Location import           Development.IDE.Types.Options-import           Outputable                        hiding ((<>)) +import           Development.IDE.GHC.Compat        hiding (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           HieDb  import           Language.LSP.Types                (DiagnosticTag (..)) -import           DriverPhases-import           DriverPipeline                    hiding (unP)-import           HscTypes-import           LoadIface                         (loadModuleInterface)--import           Lexer-import qualified Parser #if MIN_VERSION_ghc(8,10,0) import           Control.DeepSeq                   (force, rnf) #else@@ -63,35 +62,13 @@ import           ErrUtils #endif -import           Development.IDE.GHC.Compat        hiding (parseModule,-                                                    typecheckModule,-                                                    writeHieFile)-import qualified Development.IDE.GHC.Compat        as Compat-import qualified Development.IDE.GHC.Compat        as GHC-import           Finder-import           GhcMonad-import           GhcPlugins                        as GHC hiding (fst3, (<>))-import           Hooks-import           HscMain                           (hscDesugar, hscGenHardCode,-                                                    hscInteractive, hscSimplify,-                                                    hscTypecheckRename,-                                                    makeSimpleDetails)-import           MkIface-import           StringBuffer                      as SB-import           TcIface                           (typecheckIface)-import           TcRnMonad                         hiding (newUnique)+ #if MIN_VERSION_ghc(9,0,1)-import           GHC.Builtin.Names-import           GHC.Iface.Recomp import           GHC.Tc.Gen.Splice-import           GHC.Tc.Types.Evidence             (EvBind) #else-import           PrelNames import           TcSplice #endif-import           TidyPgm -import           Bag import           Control.Exception                 (evaluate) import           Control.Exception.Safe import           Control.Lens                      hiding (List)@@ -108,14 +85,14 @@ import qualified Data.Text                         as T import           Data.Time                         (UTCTime, getCurrentTime) import qualified GHC.LanguageExtensions            as LangExt-import           HeaderInfo-import           Linker                            (unload)-import           Maybes                            (orElse) import           System.Directory import           System.FilePath import           System.IO.Extra                   (fixIO, newTempFileWithin)-import           TcEnv                             (tcLookup) +-- GHC API imports+import           GHC                               (GetDocsFailure (..),+                                                    parsedSource)+ import           Control.Concurrent.Extra import           Control.Concurrent.STM            hiding (orElse) import           Data.Aeson                        (toJSON)@@ -124,8 +101,7 @@ import           Data.Functor import qualified Data.HashMap.Strict               as HashMap import           Data.Tuple.Extra                  (dupe)-import           Data.Unique-import           GHC.Fingerprint+import           Data.Unique                       as Unique import qualified Language.LSP.Server               as LSP import qualified Language.LSP.Types                as LSP @@ -146,11 +122,10 @@ -- | Given a package identifier, what packages does it depend on computePackageDeps     :: HscEnv-    -> InstalledUnitId-    -> IO (Either [FileDiagnostic] [InstalledUnitId])+    -> Unit+    -> IO (Either [FileDiagnostic] [UnitId]) computePackageDeps env pkg = do-    let dflags = hsc_dflags env-    case oldLookupInstalledPackage dflags pkg of+    case lookupUnit env pkg of         Nothing -> return $ Left [ideErrorText (toNormalizedFilePath' noFilePath) $             T.pack $ "unknown package: " ++ show pkg]         Just pkgInfo -> return $ Right $ unitDepends pkgInfo@@ -169,7 +144,12 @@          modSummary' <- initPlugins hsc modSummary         (warnings, tcm) <- withWarnings "typecheck" $ \tweak ->-            tcRnModule hsc keep_lbls $ demoteIfDefer pm{pm_mod_summary = tweak modSummary'}+            let+              session = tweak (hscSetFlags dflags hsc)+               -- TODO: maybe settings ms_hspp_opts is unnecessary?+              mod_summary'' = modSummary' { ms_hspp_opts = hsc_dflags session}+            in+              tcRnModule hsc keep_lbls $ demoteIfDefer pm{pm_mod_summary = mod_summary''}         let errorPipeline = unDefer . hideDiag dflags . tagDiag             diags = map errorPipeline warnings             deferedError = any fst diags@@ -180,10 +160,10 @@ -- | Add a Hook to the DynFlags which captures and returns the -- typechecked splices before they are run. This information -- is used for hover.-captureSplices :: DynFlags -> (DynFlags -> IO a) -> IO (a, Splices)-captureSplices dflags k = do+captureSplices :: HscEnv -> (HscEnv -> IO a) -> IO (a, Splices)+captureSplices env k = do   splice_ref <- newIORef mempty-  res <- k (dflags { hooks = addSpliceHook splice_ref (hooks dflags)})+  res <- k (hscSetHooks (addSpliceHook splice_ref (hsc_hooks env)) env)   splices <- readIORef splice_ref   return (res, splices)   where@@ -217,14 +197,13 @@ tcRnModule :: HscEnv -> [Linkable] -> ParsedModule -> IO TcModuleResult tcRnModule hsc_env keep_lbls pmod = do   let ms = pm_mod_summary pmod-      hsc_env_tmp = hsc_env { hsc_dflags = ms_hspp_opts ms }+      hsc_env_tmp = hscSetFlags (ms_hspp_opts ms) hsc_env    unload hsc_env_tmp keep_lbls    ((tc_gbl_env, mrn_info), splices)-      <- liftIO $ captureSplices (ms_hspp_opts ms) $ \dflags ->-             do  let hsc_env_tmp = hsc_env { hsc_dflags = dflags }-                 hscTypecheckRename hsc_env_tmp ms $+      <- liftIO $ captureSplices (hscSetFlags (ms_hspp_opts ms) hsc_env) $ \hsc_env_tmp ->+             do  hscTypecheckRename hsc_env_tmp ms $                           HsParsedModule { hpm_module = parsedSource pmod,                                            hpm_src_files = pm_extra_src_files pmod,                                            hpm_annotations = pm_annotations pmod }@@ -235,7 +214,7 @@  mkHiFileResultNoCompile :: HscEnv -> TcModuleResult -> IO HiFileResult mkHiFileResultNoCompile session tcm = do-  let hsc_env_tmp = session { hsc_dflags = ms_hspp_opts ms }+  let hsc_env_tmp = hscSetFlags (ms_hspp_opts ms) session       ms = pm_mod_summary $ tmrParsed tcm       tcGblEnv = tmrTypechecked tcm   details <- makeSimpleDetails hsc_env_tmp tcGblEnv@@ -255,7 +234,7 @@     -> LinkableType -- ^ use object code or byte code?     -> IO (IdeResult HiFileResult) mkHiFileResultCompile session' tcm simplified_guts ltype = catchErrs $ do-  let session = session' { hsc_dflags = ms_hspp_opts ms }+  let session = hscSetFlags (ms_hspp_opts ms) session'       ms = pm_mod_summary $ tmrParsed tcm       tcGblEnv = tmrTypechecked tcm @@ -297,8 +276,8 @@  initPlugins :: HscEnv -> ModSummary -> IO ModSummary initPlugins session modSummary = do-    dflags <- liftIO $ initializePlugins session $ ms_hspp_opts modSummary-    return modSummary{ms_hspp_opts = dflags}+    session1 <- liftIO $ initializePlugins (hscSetFlags (ms_hspp_opts modSummary) session)+    return modSummary{ms_hspp_opts = hsc_dflags session1}  -- | Whether we should run the -O0 simplifier when generating core. --@@ -318,9 +297,9 @@     fmap (either (, Nothing) (second Just)) $         catchSrcErrors (hsc_dflags session) "compile" $ do             (warnings,desugared_guts) <- withWarnings "compile" $ \tweak -> do-               let ms' = tweak ms-                   session' = session{ hsc_dflags = ms_hspp_opts ms'}-               desugar <- hscDesugar session' ms' tcg+               let session' = tweak (hscSetFlags (ms_hspp_opts ms) session)+               -- TODO: maybe settings ms_hspp_opts is unnecessary?+               desugar <- hscDesugar session' (ms { ms_hspp_opts = hsc_dflags session' })  tcg                if simplify                then do                  plugins <- readIORef (tcg_th_coreplugins tcg)@@ -337,23 +316,20 @@                   fp = replaceExtension dot_o "s"               createDirectoryIfMissing True (takeDirectory fp)               (warnings, dot_o_fp) <--                withWarnings "object" $ \_tweak -> do-                      let summary' = _tweak summary-#if MIN_VERSION_ghc(8,10,0)-                          target = defaultObjectTarget $ hsc_dflags session-#else-                          target = defaultObjectTarget $ targetPlatform $ hsc_dflags session-#endif-                          session' = session { hsc_dflags = updOptLevel 0 $ (ms_hspp_opts summary') { outputFile = Just dot_o , hscTarget = target}}+                withWarnings "object" $ \tweak -> do+                      let env' = tweak (hscSetFlags (ms_hspp_opts summary) session)+                          target = platformDefaultBackend (hsc_dflags env')+                          newFlags = setBackend target $ updOptLevel 0 $ (hsc_dflags env') { outputFile = Just dot_o }+                          session' = hscSetFlags newFlags session #if MIN_VERSION_ghc(9,0,1)                       (outputFilename, _mStub, _foreign_files, _cinfos) <- hscGenHardCode session' guts #else                       (outputFilename, _mStub, _foreign_files) <- hscGenHardCode session' guts #endif #if MIN_VERSION_ghc(8,10,0)-                                (ms_location summary')+                                (ms_location summary) #else-                                summary'+                                summary #endif                                 fp                       compileFile session' StopLn (outputFilename, Just (As False))@@ -370,8 +346,9 @@           catchSrcErrors (hsc_dflags hscEnv) "bytecode" $ do               (warnings, (_, bytecode, sptEntries)) <-                 withWarnings "bytecode" $ \_tweak -> do-                      let summary' = _tweak summary-                          session = hscEnv { hsc_dflags = ms_hspp_opts summary' }+                      let session = _tweak (hscSetFlags (ms_hspp_opts summary) hscEnv)+                          -- TODO: maybe settings ms_hspp_opts is unnecessary?+                          summary' = summary { ms_hspp_opts = hsc_dflags session }                       hscInteractive session guts #if MIN_VERSION_ghc(8,10,0)                                 (ms_location summary')@@ -475,16 +452,16 @@     -- These varBinds use unitDataConId but it could be anything as the id name is not used     -- during the hie file generation process. It's a workaround for the fact that the hie modules     -- don't export an interface which allows for additional information to be added to hie files.-    let fake_splice_binds = listToBag (map (mkVarBind unitDataConId) (spliceExpresions $ tmrTopLevelSplices tcm))+    let fake_splice_binds = Util.listToBag (map (mkVarBind unitDataConId) (spliceExpresions $ tmrTopLevelSplices tcm))         real_binds = tcg_binds $ tmrTypechecked tcm #if MIN_VERSION_ghc(9,0,1)         ts = tmrTypechecked tcm :: TcGblEnv-        top_ev_binds = tcg_ev_binds ts :: Bag EvBind+        top_ev_binds = tcg_ev_binds ts :: Util.Bag EvBind         insts = tcg_insts ts :: [ClsInst]         tcs = tcg_tcs ts :: [TyCon]-    Just <$> GHC.enrichHie (fake_splice_binds `unionBags` real_binds) (tmrRenamed tcm) top_ev_binds insts tcs+    Just <$> GHC.enrichHie (fake_splice_binds `Util.unionBags` real_binds) (tmrRenamed tcm) top_ev_binds insts tcs #else-    Just <$> GHC.enrichHie (fake_splice_binds `unionBags` real_binds) (tmrRenamed tcm)+    Just <$> GHC.enrichHie (fake_splice_binds `Util.unionBags` real_binds) (tmrRenamed tcm) #endif   where     dflags = hsc_dflags hscEnv@@ -527,7 +504,7 @@ -- TVar to 0 in order to set it up for a fresh indexing session. Otherwise, we -- can just increment the 'indexCompleted' TVar and exit. ---indexHieFile :: ShakeExtras -> ModSummary -> NormalizedFilePath -> Fingerprint -> Compat.HieFile -> IO ()+indexHieFile :: ShakeExtras -> ModSummary -> NormalizedFilePath -> Util.Fingerprint -> Compat.HieFile -> IO () indexHieFile se mod_summary srcPath !hash hf = do  IdeOptions{optProgressStyle} <- getIdeOptionsIO se  atomically $ do@@ -565,7 +542,7 @@           case lspEnv se of             Nothing -> pure Nothing             Just env -> LSP.runLspT env $ do-              u <- LSP.ProgressTextToken . T.pack . show . hashUnique <$> liftIO newUnique+              u <- LSP.ProgressTextToken . T.pack . show . hashUnique <$> liftIO Unique.newUnique               -- TODO: Wait for the progress create response to use the token               _ <- LSP.sendRequest LSP.SWindowWorkDoneProgressCreate (LSP.WorkDoneProgressCreateParams u) (const $ pure ())               LSP.sendNotification LSP.SProgress $ LSP.ProgressParams u $@@ -634,7 +611,7 @@     hf <- runHsc hscEnv $       GHC.mkHieFile' mod_summary exports ast source     atomicFileWrite targetPath $ flip GHC.writeHieFile hf-    hash <- getFileHash targetPath+    hash <- Util.getFileHash targetPath     indexHieFile se mod_summary srcPath hash hf   where     dflags       = hsc_dflags hscEnv@@ -645,7 +622,7 @@ writeHiFile hscEnv tc =   handleGenerationErrors dflags "interface write" $ do     atomicFileWrite targetPath $ \fp ->-      writeIfaceFile dflags fp modIface+      writeIfaceFile hscEnv fp modIface   where     modIface = hm_iface $ hirHomeMod tc     targetPath = ml_hi_file $ ms_location $ hirModSummary tc@@ -674,7 +651,7 @@      -- Make modules available for others that import them,     -- by putting them in the finder cache.-    let ims  = map (installedModule (thisInstalledUnitId $ hsc_dflags session) . moduleName . ms_mod) mss+    let ims  = map (installedModule (homeUnitId_ $ hsc_dflags session) . moduleName . ms_mod) mss         ifrs = zipWith (\ms -> InstalledFound (ms_location ms)) mss ims     -- set the target and module graph in the session         graph = mkModuleGraph mss@@ -718,7 +695,7 @@   :: HscEnv   -> FilePath   -> UTCTime-  -> Maybe SB.StringBuffer+  -> Maybe Util.StringBuffer   -> ExceptT [FileDiagnostic] IO ModSummaryResult getModSummaryFromImports env fp modTime contents = do     (contents, opts, dflags) <- preprocessor env fp contents@@ -730,7 +707,7 @@     let mb_mod = hsmodName hsmod         imps = hsmodImports hsmod -        mod = fmap unLoc mb_mod `orElse` mAIN_NAME+        mod = fmap unLoc mb_mod `Util.orElse` mAIN_NAME          (src_idecls, ord_idecls) = partition ((== IsBoot) . ideclSource.unLoc) imps @@ -756,7 +733,7 @@      modLoc <- liftIO $ mkHomeModLocation dflags mod fp -    let modl = mkModule (thisPackage dflags) mod+    let modl = mkHomeModule (hscHomeUnit (hscSetFlags dflags env)) mod         sourceType = if "-boot" `isSuffixOf` takeExtension fp then HsBootFile else HsSrcFile         msrModSummary =             ModSummary@@ -785,14 +762,14 @@         -- eliding the timestamps, the preprocessed source and other non relevant fields         computeFingerprint opts ModSummary{..} = do             fingerPrintImports <- fingerprintFromPut $ do-                  put $ uniq $ moduleNameFS $ moduleName ms_mod+                  put $ Util.uniq $ moduleNameFS $ moduleName ms_mod                   forM_ (ms_srcimps ++ ms_textual_imps) $ \(mb_p, m) -> do-                    put $ uniq $ moduleNameFS $ unLoc m-                    whenJust mb_p $ put . uniq-            return $! fingerprintFingerprints $-                    [ fingerprintString fp+                    put $ Util.uniq $ moduleNameFS $ unLoc m+                    whenJust mb_p $ put . Util.uniq+            return $! Util.fingerprintFingerprints $+                    [ Util.fingerprintString fp                     , fingerPrintImports-                    ] ++ map fingerprintString opts+                    ] ++ map Util.fingerprintString opts   -- | Parse only the module header@@ -800,15 +777,15 @@        :: Monad m        => DynFlags -- ^ flags to use        -> FilePath  -- ^ the filename (for source locations)-       -> SB.StringBuffer -- ^ Haskell module source text (full Unicode is supported)+       -> Util.StringBuffer -- ^ Haskell module source text (full Unicode is supported) #if MIN_VERSION_ghc(9,0,1)        -> ExceptT [FileDiagnostic] m ([FileDiagnostic], Located(HsModule)) #else        -> ExceptT [FileDiagnostic] m ([FileDiagnostic], Located(HsModule GhcPs)) #endif parseHeader dflags filename contents = do-   let loc  = mkRealSrcLoc (mkFastString filename) 1 1-   case unP Parser.parseHeader (mkPState dflags contents loc) of+   let loc  = mkRealSrcLoc (Util.mkFastString filename) 1 1+   case unP Compat.parseHeader (initParserState (initParserOpts dflags) contents loc) of #if MIN_VERSION_ghc(8,10,0)      PFailed pst ->         throwE $ diagFromErrMsgs "parser" dflags $ getErrorMessages pst dflags@@ -828,9 +805,9 @@         -- errors are those from which a parse tree just can't         -- be produced.         unless (null errs) $-            throwE $ diagFromErrMsgs "parser" dflags errs+            throwE $ diagFromErrMsgs "parser" dflags (fmap pprError errs) -        let warnings = diagFromErrMsgs "parser" dflags warns+        let warnings = diagFromErrMsgs "parser" dflags (fmap pprWarning warns)         return (warnings, rdr_module)  -- | Given a buffer, flags, and file path, produce a@@ -843,10 +820,10 @@        -> ModSummary        -> ExceptT [FileDiagnostic] IO ([FileDiagnostic], ParsedModule) parseFileContents env customPreprocessor filename ms = do-   let loc  = mkRealSrcLoc (mkFastString filename) 1 1+   let loc  = mkRealSrcLoc (Util.mkFastString filename) 1 1        dflags = ms_hspp_opts ms        contents = fromJust $ ms_hspp_buf ms-   case unP Parser.parseModule (mkPState dflags contents loc) of+   case unP Compat.parseModule (initParserState (initParserOpts dflags) contents loc) of #if MIN_VERSION_ghc(8,10,0)      PFailed pst -> throwE $ diagFromErrMsgs "parser" dflags $ getErrorMessages pst dflags #else@@ -854,21 +831,8 @@       throwE $ diagFromErrMsg "parser" dflags $ mkPlainErrMsg dflags locErr msgErr #endif      POk pst rdr_module ->-         let hpm_annotations :: ApiAnns-             hpm_annotations =-#if MIN_VERSION_ghc(9,0,1)-               -- Copied from GHC.Driver.Main-               ApiAnns {-                      apiAnnItems = Map.fromListWith (++) $ annotations pst,-                      apiAnnEofPos = eof_pos pst,-                      apiAnnComments = Map.fromList (annotations_comments pst),-                      apiAnnRogueComments = comment_q pst-                   }-#else-               (Map.fromListWith (++) $ annotations pst,-                 Map.fromList ((noSrcSpan,comment_q pst)-                                  :annotations_comments pst))-#endif+         let+             hpm_annotations = mkApiAnns pst              (warns, errs) = getMessages pst dflags          in            do@@ -908,7 +872,7 @@                                   $ filter (/= n_hspp)                                   $ map normalise                                   $ filter (not . isPrefixOf "<")-                                  $ map unpackFS+                                  $ map Util.unpackFS                                   $ srcfiles pst                    srcs1 = case ml_hs_file (ms_location ms) of                              Just f  -> filter (/= normalise f) srcs0@@ -919,13 +883,7 @@                -- filter them out:                srcs2 <- liftIO $ filterM doesFileExist srcs1 -               let pm =-                     ParsedModule {-                         pm_mod_summary = ms-                       , pm_parsed_source = parsed'-                       , pm_extra_src_files = srcs2-                       , pm_annotations = hpm_annotations-                      }+               let pm = mkParsedModule ms parsed' srcs2 hpm_annotations                    warnings = diagFromErrMsgs "parser" dflags warns                pure (warnings ++ preproc_warnings, pm) @@ -944,7 +902,7 @@   -> (Maybe LinkableType -> m ([FileDiagnostic], Maybe HiFileResult)) -- ^ Action to regenerate an interface   -> m ([FileDiagnostic], Maybe HiFileResult) loadInterface session ms sourceMod linkableNeeded regen = do-    let sessionWithMsDynFlags = session{hsc_dflags = ms_hspp_opts ms}+    let sessionWithMsDynFlags = hscSetFlags (ms_hspp_opts ms) session     res <- liftIO $ checkOldIface sessionWithMsDynFlags ms sourceMod Nothing     case res of           (UpToDate, Just iface)@@ -1019,7 +977,7 @@         UnhelpfulLoc {} -> True  fakeSpan :: RealSrcSpan-fakeSpan = realSrcLocSpan $ mkRealSrcLoc (fsLit "<ghcide>") 1 1+fakeSpan = realSrcLocSpan $ mkRealSrcLoc (Util.fsLit "<ghcide>") 1 1  -- | Non-interactive, batch version of 'InteractiveEval.lookupNames'. --   The interactive paths create problems in ghc-lib builds