Fix build with fbghc (#2234)

* Fix build with fbghc * bump ghcide version number * fix GHC 9 imports
haskell · Sep 23, 2021 · c419b37 · c419b37
1 parent 465646c
commit c419b37
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
@@ -2,7 +2,7 @@ cabal-version:      2.4
 build-type:         Simple
 category:           Development
 name:               ghcide
-version:            1.4.2.1
+version:            1.4.2.2
 license:            Apache-2.0
 license-file:       LICENSE
 author:             Digital Asset and Ghcide contributors

diff --git a/ghcide/src/Development/IDE/GHC/Compat/Units.hs b/ghcide/src/Development/IDE/GHC/Compat/Units.hs
@@ -49,46 +49,41 @@ module Development.IDE.GHC.Compat.Units (
 
 #if MIN_VERSION_ghc(9,0,0)
 #if MIN_VERSION_ghc(9,2,0)
-import qualified GHC.Data.ShortText             as ST
-import           GHC.Driver.Env                 (hsc_unit_dbs)
+import qualified GHC.Data.ShortText              as ST
+import           GHC.Driver.Env                  (hsc_unit_dbs)
 import           GHC.Unit.Env
 import           GHC.Unit.External
 #else
 import           GHC.Driver.Types
 #endif
 import           GHC.Data.FastString
-import           GHC.Driver.Session             (PackageArg (..),
-                                                 PackageFlag (..))
-import qualified GHC.Driver.Session             as DynFlags
+import qualified GHC.Driver.Session              as DynFlags
 import           GHC.Types.Unique.Set
-import qualified GHC.Unit.Info                  as UnitInfo
-import           GHC.Unit.Module.Name           (ModuleName)
-import           GHC.Unit.State                 (LookupResult, PackageName,
-                                                 UnitInfo,
-                                                 UnitState (unitInfoMap))
-import qualified GHC.Unit.State                 as State
-import           GHC.Unit.Types                 hiding (moduleUnit, toUnitId)
-import qualified GHC.Unit.Types                 as Unit
+import qualified GHC.Unit.Info                   as UnitInfo
+import           GHC.Unit.State                  (LookupResult, UnitInfo,
+                                                  UnitState (unitInfoMap))
+import qualified GHC.Unit.State                  as State
+import           GHC.Unit.Types                  hiding (moduleUnit, toUnitId)
+import qualified GHC.Unit.Types                  as Unit
 #else
-import           DynFlags                       (PackageArg (..),
-                                                 PackageFlag (..))
 import qualified DynFlags
 import           FastString
 import           HscTypes
-import           Module                         hiding (moduleUnitId)
+import           Module                          hiding (moduleUnitId)
 import qualified Module
-import           Packages                       (InstalledPackageInfo (haddockInterfaces, packageName),
-                                                 LookupResult, PackageConfig,
-                                                 PackageConfigMap, PackageName,
-                                                 PackageState,
-                                                 getPackageConfigMap,
-                                                 lookupPackage')
+import           Packages                        (InstalledPackageInfo (haddockInterfaces, packageName),
+                                                  LookupResult, PackageConfig,
+                                                  PackageConfigMap,
+                                                  PackageState,
+                                                  getPackageConfigMap,
+                                                  lookupPackage')
 import qualified Packages
 #endif
 
+import           Development.IDE.GHC.Compat.Core
 import           Development.IDE.GHC.Compat.Env
 #if MIN_VERSION_ghc(9,0,0) && !MIN_VERSION_ghc(9,2,0)
-import           Data.Map                       (Map)
+import           Data.Map                        (Map)
 #endif
 import           Data.Either
 import           Data.Version