Tidy a bit

haskell · Jul 31, 2023 · 861aef6 · 861aef6
1 parent 75096d7
commit 861aef6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 39 deletions.
diff --git a/ghcide/src/Development/IDE/GHC/Compat.hs b/ghcide/src/Development/IDE/GHC/Compat.hs
@@ -69,7 +69,6 @@ module Development.IDE.GHC.Compat(
     enrichHie,
     writeHieFile,
     readHieFile,
-    supportsHieFiles,
     setHieDir,
     dontWriteHieFiles,
     module Compat.HieTypes,
@@ -406,9 +405,6 @@ pattern PFailedWithErrorMessages msgs
 #endif
 {-# COMPLETE POk, PFailedWithErrorMessages #-}
 
-supportsHieFiles :: Bool
-supportsHieFiles = True
-
 hieExportNames :: HieFile -> [(SrcSpan, Name)]
 hieExportNames = nameListFromAvails . hie_exports
 

diff --git a/ghcide/src/Development/IDE/GHC/Compat/Units.hs b/ghcide/src/Development/IDE/GHC/Compat/Units.hs
@@ -26,7 +26,7 @@ module Development.IDE.GHC.Compat.Units (
     unitExposedModules,
     unitDepends,
     unitHaddockInterfaces,
-    unitInfoId,
+    mkUnit,
     unitPackageNameString,
     unitPackageVersion,
     -- * UnitId helpers
@@ -72,10 +72,14 @@ import qualified GHC.Driver.Session                    as DynFlags
 import           GHC.Types.Unique.Set
 import qualified GHC.Unit.Info                         as UnitInfo
 import           GHC.Unit.State                        (LookupResult, UnitInfo,
-                                                        UnitState (unitInfoMap))
+                                                        UnitState (unitInfoMap),
+                                                        lookupUnit', mkUnit,
+                                                        unitDepends,
+                                                        unitExposedModules,
+                                                        unitPackageNameString,
+                                                        unitPackageVersion)
 import qualified GHC.Unit.State                        as State
-import           GHC.Unit.Types                        hiding (moduleUnit,
-                                                        toUnitId)
+import           GHC.Unit.Types
 import qualified GHC.Unit.Types                        as Unit
 import           GHC.Utils.Outputable
 
@@ -197,35 +201,13 @@ getUnitInfoMap =
 lookupUnit :: HscEnv -> Unit -> Maybe UnitInfo
 lookupUnit env pid = State.lookupUnit (unitState env) pid
 
-lookupUnit' :: Bool -> UnitInfoMap -> PreloadUnitClosure -> Unit -> Maybe UnitInfo
-lookupUnit' = State.lookupUnit'
-
 preloadClosureUs :: HscEnv -> PreloadUnitClosure
 #if MIN_VERSION_ghc(9,2,0)
 preloadClosureUs = State.preloadClosure . unitState
 #else
 preloadClosureUs = State.preloadClosure . unitState
 #endif
 
-unitExposedModules :: UnitInfo -> [(ModuleName, Maybe Module)]
-unitExposedModules ue =
-  UnitInfo.unitExposedModules ue
-
-unitDepends :: UnitInfo -> [UnitId]
-unitDepends = State.unitDepends
-
-unitPackageNameString :: UnitInfo -> String
-unitPackageNameString =
-  UnitInfo.unitPackageNameString
-
-unitPackageVersion :: UnitInfo -> Version
-unitPackageVersion =
-  UnitInfo.unitPackageVersion
-
-unitInfoId :: UnitInfo -> Unit
-unitInfoId =
-  UnitInfo.mkUnit
-
 unitHaddockInterfaces :: UnitInfo -> [FilePath]
 unitHaddockInterfaces =
 #if MIN_VERSION_ghc(9,2,0)
@@ -257,18 +239,10 @@ installedModule        = Module
 
 #endif
 
-toUnitId :: Unit -> UnitId
-toUnitId =
-    Unit.toUnitId
-
 moduleUnitId :: Module -> UnitId
 moduleUnitId =
     Unit.toUnitId . Unit.moduleUnit
 
-moduleUnit :: Module -> Unit
-moduleUnit =
-    Unit.moduleUnit
-
 filterInplaceUnits :: [UnitId] -> [PackageFlag] -> ([UnitId], [PackageFlag])
 filterInplaceUnits us packageFlags =
   partitionEithers (map isInplace packageFlags)

diff --git a/ghcide/src/Development/IDE/Types/HscEnvEq.hs b/ghcide/src/Development/IDE/Types/HscEnvEq.hs
@@ -91,7 +91,7 @@ newHscEnvEqWithImportPaths envImportPaths hscEnv deps = do
                         -- When module is re-exported from another package,
                         -- the origin module is represented by value in Just
                         Just otherPkgMod -> otherPkgMod
-                        Nothing          -> mkModule (unitInfoId pkg) modName
+                        Nothing          -> mkModule (mkUnit pkg) modName
                 ]
 
             doOne m = do