Fix older ghc builds

Author: nlander

cabal.project

@@ -40,7 +40,7 @@ packages:
 source-repository-package
   type:git
   location: https://github.com/nlander/HieDb.git
-  tag: f10051a6dc1b809d5f40a45beab92205d1829736
+  tag: 4eebfcf8fab54f24808e6301227d77ae64d2509c
 
 -- 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

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

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

@@ -19,14 +19,15 @@ module Development.IDE.GHC.Compat.Units (
     -- * UnitInfoMap
     UnitInfoMap,
     getUnitInfoMap,
+    getUnitInfo,
     lookupUnit,
     lookupUnit',
     -- * UnitInfo
     UnitInfo,
     unitExposedModules,
     unitHiddenModules,
     unitLibraryDirs,
-    UnitInfo.unitId,
+    unitId,
     unitDepends,
     unitHaddockInterfaces,
     unitInfoId,
@@ -45,6 +46,7 @@ module Development.IDE.GHC.Compat.Units (
     installedModule,
     -- * Module
     toUnitId,
+    fromUnitId,
     Development.IDE.GHC.Compat.Units.moduleUnitId,
     moduleUnit,
     -- * ExternalPackageState
@@ -268,6 +270,16 @@ getUnitInfoMap =
   Packages.getPackageConfigMap . hsc_dflags
 #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
 #if MIN_VERSION_ghc(9,0,0)
 lookupUnit env pid = State.lookupUnit (unitState env) pid
@@ -292,7 +304,13 @@ preloadClosureUs = const ()
 #endif
 
 unitLibraryDirs :: UnitInfo -> [FilePath]
+#if MIN_VERSION_ghc(9,2,0)
 unitLibraryDirs = fmap ST.unpack . UnitInfo.unitLibraryDirs
+#elif MIN_VERSION_ghc(9,0,0)
+unitLibraryDirs = UnitInfo.unitLibraryDirs
+#else
+unitLibraryDirs = Packages.libraryDirs
+#endif
 
 unitExposedModules :: UnitInfo -> [(ModuleName, Maybe Module)]
 unitExposedModules ue =
@@ -303,7 +321,11 @@ unitExposedModules ue =
 #endif
 
 unitHiddenModules :: UnitInfo -> [ModuleName]
+#if MIN_VERSION_ghc(9,0,0)
 unitHiddenModules = UnitInfo.unitHiddenModules
+#else
+unitHiddenModules = Packages.hiddenModules
+#endif
 
 unitDepends :: UnitInfo -> [UnitId]
 #if MIN_VERSION_ghc(9,0,0)
@@ -384,6 +406,13 @@ installedModule :: UnitId -> ModuleName -> Module.InstalledModule
 installedModule uid modname = Module.InstalledModule (Module.toInstalledUnitId uid) modname
 #endif
 
+unitId :: UnitInfo -> UnitId
+#if MIN_VERSION_ghc(9,0,0)
+unitId = UnitInfo.unitId
+#else
+unitId = Packages.packageConfigId
+#endif
+
 toUnitId :: Unit -> UnitId
 toUnitId =
 #if MIN_VERSION_ghc(9,0,0)
@@ -392,6 +421,14 @@ toUnitId =
     id
 #endif
 
+fromUnitId :: UnitId -> Unit
+fromUnitId =
+#if MIN_VERSION_ghc(9,0,0)
+    RealUnit . Definite
+#else
+    id
+#endif
+
 moduleUnitId :: Module -> UnitId
 moduleUnitId =
 #if MIN_VERSION_ghc(9,0,0)