Merge branch 'master' into rebeccat/ghc94

Author: wavewave

ghcide/ghcide.cabal

@@ -229,10 +229,6 @@ library
     if flag(ghc-patched-unboxed-bytecode)
       cpp-options: -DGHC_PATCHED_UNBOXED_BYTECODE
 
-    if impl(ghc < 8.10)
-      exposed-modules:
-        Development.IDE.GHC.Compat.CPP
-
     if impl(ghc >= 9)
         ghc-options: -Wunused-packages
 

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

@@ -216,6 +216,7 @@ module Development.IDE.GHC.Compat.Core (
     noLocA,
     unLocA,
     LocatedAn,
+    LocatedA,
 #if MIN_VERSION_ghc(9,2,0)
     GHC.AnnListItem(..),
     GHC.NameAnn(..),
@@ -482,8 +483,9 @@ module Development.IDE.GHC.Compat.Core (
 #if !MIN_VERSION_ghc_boot_th(9,4,1)
     Extension(.., NamedFieldPuns),
 #else
-    Extension(..)
+    Extension(..),
 #endif
+    UniqFM,
     ) where
 
 import qualified GHC
@@ -518,7 +520,8 @@ import           GHC.Core.DataCon             hiding (dataConExTyCoVars)
 import qualified GHC.Core.DataCon             as DataCon
 import           GHC.Core.FamInstEnv          hiding (pprFamInst)
 import           GHC.Core.InstEnv
-import           GHC.Types.Unique.FM
+import           GHC.Types.Unique.FM hiding (UniqFM)
+import qualified GHC.Types.Unique.FM          as UniqFM
 #if MIN_VERSION_ghc(9,3,0)
 import qualified GHC.Driver.Config.Tidy       as GHC
 import qualified GHC.Data.Strict              as Strict
@@ -741,7 +744,8 @@ import           Type
 import           TysPrim
 import           TysWiredIn
 import           Unify
-import           UniqFM
+import           UniqFM hiding (UniqFM)
+import qualified UniqFM
 import           UniqSupply
 import           Var                          (Var (varName), setTyVarUnique,
                                                setVarUnique, varType)
@@ -1038,6 +1042,12 @@ type LocatedAn a = GHC.LocatedAn a
 type LocatedAn a = GHC.Located
 #endif
 
+#if MIN_VERSION_ghc(9,2,0)
+type LocatedA = GHC.LocatedA
+#else
+type LocatedA = GHC.Located
+#endif
+
 #if MIN_VERSION_ghc(9,2,0)
 locA :: SrcSpanAnn' a -> SrcSpan
 locA = GHC.locA
@@ -1165,3 +1175,9 @@ pattern HsFieldBind {hfbAnn, hfbLHS, hfbRHS, hfbPun} <- HsRecField hfbAnn (SrcLo
 pattern NamedFieldPuns :: Extension
 pattern NamedFieldPuns = RecordPuns
 #endif
+
+#if MIN_VERSION_ghc(9,0,0)
+type UniqFM = UniqFM.UniqFM
+#else
+type UniqFM k = UniqFM.UniqFM
+#endif

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

@@ -38,6 +38,7 @@ library
       , transformers
       , ghc-boot-th
       , unordered-containers
+      , containers
     hs-source-dirs:   src
     default-language: Haskell2010