Revert "Fix older ghc builds"

This reverts commit 5d111f6.

Author: nlander

cabal.project

@@ -37,7 +37,7 @@ packages:
 source-repository-package
   type:git
   location: https://github.com/nlander/HieDb.git
-  tag: 4eebfcf8fab54f24808e6301227d77ae64d2509c
+  tag: f10051a6dc1b809d5f40a45beab92205d1829736
 
 -- Standard location for temporary packages needed for particular environments
 -- For example it is used in the project gitlab mirror to help in the MAcOS M1 build script

ghcide/src/Development/IDE/Core/Dependencies.hs

@@ -105,7 +105,7 @@ indexDependencyHieFiles recorder se hscEnv = do
                 hieDir :: FilePath
                 hieDir = pkgLibDir </> "extra-compilation-artifacts"
                 unit :: GHC.Unit
-                unit = GHC.fromUnitId $ GHC.unitId package
+                unit = GHC.RealUnit $ GHC.Definite $ GHC.unitId package
             -- Check if we have already indexed this package.
             moduleRows <- withHieDb se $ \db ->
                 lookupPackage db unit
@@ -141,14 +141,16 @@ indexDependencyHieFiles recorder se hscEnv = do
         packages :: Set Package
         packages = Set.fromList
             $ map Package
-            -- Take only the packages that are direct or transitive dependencies.
-            $ filter (\unitInfo -> GHC.unitId unitInfo `Set.member` dependencyIds) allPackages
+            $ Map.elems
+            -- Take only the packages in the unitInfoMap that are direct
+            -- or transitive dependencies.
+            $ Map.filterWithKey (\uid _ -> uid `Set.member` dependencyIds) unitInfoMap
             where
-                allPackages :: [GHC.UnitInfo]
-                allPackages = GHC.getUnitInfo hscEnv
+                unitInfoMap :: GHC.UnitInfoMap
+                unitInfoMap = GHC.getUnitInfoMap hscEnv
                 dependencyIds :: Set GHC.UnitId
                 dependencyIds =
-                    calculateTransitiveDependencies allPackages directDependencyIds directDependencyIds
+                    calculateTransitiveDependencies unitInfoMap directDependencyIds directDependencyIds
                 directDependencyIds :: Set GHC.UnitId
                 directDependencyIds = Set.fromList
                     $ map GHC.toUnitId
@@ -157,14 +159,14 @@ indexDependencyHieFiles recorder se hscEnv = do
 
 -- calculateTransitiveDependencies finds the UnitId keys in the UnitInfoMap
 -- that are dependencies or transitive dependencies.
-calculateTransitiveDependencies :: [GHC.UnitInfo] -> Set GHC.UnitId -> Set GHC.UnitId -> Set GHC.UnitId
-calculateTransitiveDependencies allPackages allDependencies newDepencencies
-    -- If there are no new dependencies, then we have found them all,
+calculateTransitiveDependencies :: GHC.UnitInfoMap -> Set GHC.UnitId -> Set GHC.UnitId -> Set GHC.UnitId
+calculateTransitiveDependencies unitInfoMap allDependencies newDepencencies
+    -- If there are no new dependencies, we have found them all,
     -- so return allDependencies
     | Set.null newDepencencies = allDependencies
     -- Otherwise recursively add any dependencies of the newDepencencies
     -- that are not in allDependencies already.
-    | otherwise = calculateTransitiveDependencies allPackages nextAll nextNew
+    | otherwise = calculateTransitiveDependencies unitInfoMap nextAll nextNew
     where
         nextAll :: Set GHC.UnitId
         nextAll = Set.union allDependencies nextNew
@@ -175,7 +177,8 @@ calculateTransitiveDependencies allPackages allDependencies newDepencencies
         nextNew = flip Set.difference allDependencies
             $ Set.unions
             $ map (Set.fromList . GHC.unitDepends)
-            $ filter (\unitInfo -> GHC.unitId unitInfo `Set.member` newDepencencies) allPackages
+            $ Map.elems
+            $ Map.filterWithKey (\uid _ -> uid `Set.member` newDepencencies) unitInfoMap
 
 getModulesForPackage :: Package -> [GHC.Module]
 getModulesForPackage (Package package) =

ghcide/src/Development/IDE/GHC/Compat/Units.hs

@@ -19,7 +19,6 @@ module Development.IDE.GHC.Compat.Units (
     -- * UnitInfoMap
     UnitInfoMap,
     getUnitInfoMap,
-    getUnitInfo,
     lookupUnit,
     lookupUnit',
     -- * UnitInfo
@@ -43,7 +42,6 @@ module Development.IDE.GHC.Compat.Units (
     installedModule,
     -- * Module
     toUnitId,
-    fromUnitId,
     Development.IDE.GHC.Compat.Units.moduleUnitId,
     moduleUnit,
     -- * ExternalPackageState
@@ -215,28 +213,14 @@ getUnitInfoMap =
   unitInfoMap . unitState
 #endif
 
-getUnitInfo :: HscEnv -> [UnitInfo]
-getUnitInfo =
-#if MIN_VERSION_ghc(9,2,0)
-  State.listUnitInfo . ue_units . hsc_unit_env
-#elif MIN_VERSION_ghc(9,0,0)
-  State.listUnitInfo . unitState
-#else
-  Packages.listPackageConfigMap . hsc_dflags
-#endif
-
 lookupUnit :: HscEnv -> Unit -> Maybe UnitInfo
 lookupUnit env pid = State.lookupUnit (unitState env) pid
 
 preloadClosureUs :: HscEnv -> PreloadUnitClosure
 preloadClosureUs = State.preloadClosure . unitState
 
 unitHiddenModules :: UnitInfo -> [ModuleName]
-#if MIN_VERSION_ghc(9,0,0)
 unitHiddenModules = UnitInfo.unitHiddenModules
-#else
-unitHiddenModules = Packages.hiddenModules
-#endif
 
 unitLibraryDirs :: UnitInfo -> [FilePath]
 unitLibraryDirs =
@@ -277,14 +261,6 @@ installedModule        = Module
 
 #endif
 
-fromUnitId :: UnitId -> Unit
-fromUnitId =
-#if MIN_VERSION_ghc(9,0,0)
-    RealUnit . Definite
-#else
-    id
-#endif
-
 moduleUnitId :: Module -> UnitId
 moduleUnitId =
     Unit.toUnitId . Unit.moduleUnit