@@ -49,46 +49,41 @@ module Development.IDE.GHC.Compat.Units (
4949
5050#if MIN_VERSION_ghc(9,0,0)
5151#if MIN_VERSION_ghc(9,2,0)
52- import qualified GHC.Data.ShortText as ST
53- import GHC.Driver.Env (hsc_unit_dbs )
52+ import qualified GHC.Data.ShortText as ST
53+ import GHC.Driver.Env (hsc_unit_dbs )
5454import GHC.Unit.Env
5555import GHC.Unit.External
5656#else
5757import GHC.Driver.Types
5858#endif
5959import GHC.Data.FastString
60- import GHC.Driver.Session (PackageArg (.. ),
61- PackageFlag (.. ))
62- import qualified GHC.Driver.Session as DynFlags
60+ import qualified GHC.Driver.Session as DynFlags
6361import GHC.Types.Unique.Set
64- import qualified GHC.Unit.Info as UnitInfo
65- import GHC.Unit.Module.Name (ModuleName )
66- import GHC.Unit.State (LookupResult , PackageName ,
67- UnitInfo ,
68- UnitState (unitInfoMap ))
69- import qualified GHC.Unit.State as State
70- import GHC.Unit.Types hiding (moduleUnit , toUnitId )
71- import qualified GHC.Unit.Types as Unit
62+ import qualified GHC.Unit.Info as UnitInfo
63+ import GHC.Unit.State (LookupResult , UnitInfo ,
64+ UnitState (unitInfoMap ))
65+ import qualified GHC.Unit.State as State
66+ import GHC.Unit.Types hiding (moduleUnit , toUnitId )
67+ import qualified GHC.Unit.Types as Unit
7268#else
73- import DynFlags (PackageArg (.. ),
74- PackageFlag (.. ))
7569import qualified DynFlags
7670import FastString
7771import HscTypes
78- import Module hiding (moduleUnitId )
72+ import Module hiding (moduleUnitId )
7973import qualified Module
80- import Packages (InstalledPackageInfo (haddockInterfaces , packageName ),
81- LookupResult , PackageConfig ,
82- PackageConfigMap , PackageName ,
83- PackageState ,
84- getPackageConfigMap ,
85- lookupPackage' )
74+ import Packages (InstalledPackageInfo (haddockInterfaces , packageName ),
75+ LookupResult , PackageConfig ,
76+ PackageConfigMap ,
77+ PackageState ,
78+ getPackageConfigMap ,
79+ lookupPackage' )
8680import qualified Packages
8781#endif
8882
83+ import Development.IDE.GHC.Compat.Core
8984import Development.IDE.GHC.Compat.Env
9085#if MIN_VERSION_ghc(9,0,0) && !MIN_VERSION_ghc(9,2,0)
91- import Data.Map (Map )
86+ import Data.Map (Map )
9287#endif
9388import Data.Either
9489import Data.Version
0 commit comments