@@ -49,46 +49,41 @@ module Development.IDE.GHC.Compat.Units (
49
49
50
50
#if MIN_VERSION_ghc(9,0,0)
51
51
#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 )
54
54
import GHC.Unit.Env
55
55
import GHC.Unit.External
56
56
#else
57
57
import GHC.Driver.Types
58
58
#endif
59
59
import 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
63
61
import 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
72
68
#else
73
- import DynFlags (PackageArg (.. ),
74
- PackageFlag (.. ))
75
69
import qualified DynFlags
76
70
import FastString
77
71
import HscTypes
78
- import Module hiding (moduleUnitId )
72
+ import Module hiding (moduleUnitId )
79
73
import 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' )
86
80
import qualified Packages
87
81
#endif
88
82
83
+ import Development.IDE.GHC.Compat.Core
89
84
import Development.IDE.GHC.Compat.Env
90
85
#if MIN_VERSION_ghc(9,0,0) && !MIN_VERSION_ghc(9,2,0)
91
- import Data.Map (Map )
86
+ import Data.Map (Map )
92
87
#endif
93
88
import Data.Either
94
89
import Data.Version
0 commit comments