Fix build for 9.2 and 9.4 (#155)

mpickering · Jan 29, 2025 · e9a7b67 · e9a7b67
1 parent 6d2eb5e
commit e9a7b67
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/Refact/Compat.hs b/src/Refact/Compat.hs
@@ -130,7 +130,7 @@ import GHC.Driver.Session hiding (initDynFlags)
 #if MIN_VERSION_ghc(9,6,0)
 import GHC.Hs hiding (Pat, Stmt, parseModuleName, ann)
 #else
-import GHC.Hs hiding (Pat, Stmt)
+import GHC.Hs hiding (Pat, Stmt, ann)
 #endif
 import GHC.Parser.Header (getOptions)
 #if MIN_VERSION_ghc(9,8,0)
@@ -301,8 +301,10 @@ commentSrcSpan :: GHC.LEpaComment -> SrcSpan
 #if MIN_VERSION_ghc(9,12,0)
 commentSrcSpan (GHC.L (GHC.EpaSpan l) _) = l
 commentSrcSpan (GHC.L (GHC.EpaDelta l _ _) _) = l
-#else
+#elif MIN_VERSION_ghc(9,4,0)
 commentSrcSpan (GHC.L (GHC.Anchor l _) _) = GHC.RealSrcSpan l Strict.Nothing
+#else
+commentSrcSpan (GHC.L (GHC.Anchor l _) _) = GHC.RealSrcSpan l Nothing
 #endif
 
 #if MIN_VERSION_ghc(9,12,0)

diff --git a/src/Refact/Internal.hs b/src/Refact/Internal.hs
@@ -72,11 +72,11 @@ import Language.Haskell.GHC.ExactPrint.Types
     -- epRigidity,
     -- Rigidity(..),
 #endif
-#if MIN_VERSION_ghc(9,12,0)
-import Language.Haskell.GHC.ExactPrint.Utils (showAst)
-#else
-import Language.Haskell.GHC.ExactPrint.ExactPrint (showAst)
-#endif
+-- #if MIN_VERSION_ghc(9,12,0)
+-- import Language.Haskell.GHC.ExactPrint.Utils (showAst)
+-- #else
+-- import Language.Haskell.GHC.ExactPrint.ExactPrint (showAst)
+-- #endif
 import Language.Haskell.GHC.ExactPrint.Utils (ss2pos)
 import Refact.Compat
   ( AnnSpan,
@@ -116,9 +116,12 @@ import Refact.Compat
     ann,
 #endif
 
+#if MIN_VERSION_ghc(9,4,0)
     mkGeneratedHsDocString,
-    initParserOpts, AnnConstraint
-
+    initParserOpts,
+#else
+#endif
+    AnnConstraint
   )
 import Refact.Types hiding (SrcSpan)
 import qualified Refact.Types as R
@@ -593,7 +596,7 @@ combineSrcSpansLW :: GHC.SrcSpanAnnA -> GHC.SrcSpanAnnLW -> GHC.SrcSpanAnnLW
 combineSrcSpansLW (GHC.EpAnn anca _ csa) (GHC.EpAnn ancb anb csb)
     = GHC.EpAnn (anca <> ancb) anb (csa <> csb)
 #else
-combineSrcSpansLW :: Semigroup a => GHC.SrcAnn a -> GHC.SrcAnn a -> GHC.SrcAnn a 
+combineSrcSpansLW :: Semigroup a => GHC.SrcAnn a -> GHC.SrcAnn a -> GHC.SrcAnn a
 combineSrcSpansLW = combineSrcSpansA
 #endif