Skip to content

Commit 39f4368

Browse files
committed
fix: adjust import statements for compatibility with GHC versioning
1 parent c0be925 commit 39f4368

File tree

1 file changed

+5
-6
lines changed
  • ghcide/src/Development/IDE/GHC/Compat

1 file changed

+5
-6
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ import GHC.Types.TyThing
537537
import GHC.Types.TyThing.Ppr
538538
import GHC.Types.Unique
539539
import GHC.Types.Unique.Map
540+
import GHC.Types.Var.Env (TidyEnv)
540541
import GHC.Unit.Env
541542
import GHC.Unit.Finder hiding (mkHomeModLocation)
542543
import qualified GHC.Unit.Finder as GHC
@@ -548,9 +549,6 @@ import GHC.Unit.Module.ModDetails
548549
import GHC.Unit.Module.ModGuts
549550
import GHC.Unit.Module.ModIface (IfaceExport, ModIface,
550551
ModIface_ (..), mi_fix
551-
#if !MIN_VERSION_ghc(9,9,0)
552-
import GHC.Hs (SrcSpanAnn')
553-
#endif
554552
#if MIN_VERSION_ghc(9,11,0)
555553
, pattern ModIface
556554
, set_mi_top_env
@@ -562,15 +560,16 @@ import GHC.Utils.Error (mkPlainErrorMsgEnvelope)
562560
import GHC.Utils.Panic
563561
import GHC.Utils.TmpFs
564562
import Language.Haskell.Syntax hiding (FunDep)
565-
import GHC.Types.Var.Env (TidyEnv)
566563

567564
-- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
568-
569-
570565
#if !MIN_VERSION_ghc(9,7,0)
571566
import GHC.Types.Avail (greNamePrintableName)
572567
#endif
573568

569+
#if !MIN_VERSION_ghc(9,9,0)
570+
import GHC.Hs (SrcSpanAnn')
571+
#endif
572+
574573
#if MIN_VERSION_ghc(9,12,0)
575574
import System.OsString
576575
import System.FilePath (splitExtension)

0 commit comments

Comments
 (0)