@@ -186,6 +186,11 @@ module Development.IDE.GHC.Compat.Core (
186
186
SrcLoc. Located ,
187
187
SrcLoc. unLoc ,
188
188
getLoc ,
189
+ getLocA ,
190
+ locA ,
191
+ LocatedAn ,
192
+ AnnListItem ,
193
+ NameAnn ,
189
194
SrcLoc. RealLocated ,
190
195
SrcLoc. GenLocated (.. ),
191
196
SrcLoc. SrcSpan (SrcLoc. UnhelpfulSpan ),
@@ -197,6 +202,7 @@ module Development.IDE.GHC.Compat.Core (
197
202
BufSpan ,
198
203
#if MIN_VERSION_ghc(9,2,0)
199
204
SrcSpanAnn' ,
205
+ GHC. SrcAnn ,
200
206
#endif
201
207
SrcLoc. leftmost_smallest ,
202
208
SrcLoc. containsSpan ,
@@ -207,6 +213,7 @@ module Development.IDE.GHC.Compat.Core (
207
213
SrcLoc. realSrcLocSpan ,
208
214
SrcLoc. realSrcSpanStart ,
209
215
SrcLoc. realSrcSpanEnd ,
216
+ isSubspanOfA ,
210
217
SrcLoc. isSubspanOf ,
211
218
SrcLoc. wiredInSrcSpan ,
212
219
SrcLoc. mkSrcSpan ,
@@ -316,14 +323,14 @@ module Development.IDE.GHC.Compat.Core (
316
323
317
324
#if MIN_VERSION_ghc(9,2,0)
318
325
module GHC.Hs.Decls ,
326
+ module GHC.Hs.Expr ,
319
327
module GHC.Hs.Doc ,
320
328
module GHC.Hs.Extension ,
321
329
module GHC.Hs.ImpExp ,
322
330
module GHC.Hs.Pat ,
323
331
module GHC.Hs.Type ,
324
332
module GHC.Hs.Utils ,
325
- module Language.Haskell.Syntax.Binds ,
326
- module Language.Haskell.Syntax.Expr ,
333
+ module Language.Haskell.Syntax ,
327
334
#endif
328
335
329
336
module GHC.Rename.Names ,
@@ -482,6 +489,7 @@ import qualified GHC.Driver.Session as DynFlags
482
489
import GHC.Hs (HsModule (.. ), SrcSpanAnn' )
483
490
import GHC.Hs.Decls hiding (FunDep )
484
491
import GHC.Hs.Doc
492
+ import GHC.Hs.Expr
485
493
import GHC.Hs.Extension
486
494
import GHC.Hs.ImpExp
487
495
import GHC.Hs.Pat
@@ -700,8 +708,7 @@ import System.FilePath
700
708
701
709
702
710
#if MIN_VERSION_ghc(9,2,0)
703
- import Language.Haskell.Syntax.Binds
704
- import Language.Haskell.Syntax.Expr
711
+ import Language.Haskell.Syntax hiding (FunDep )
705
712
#endif
706
713
707
714
#if !MIN_VERSION_ghc(9,0,0)
@@ -950,3 +957,41 @@ setOutputFile f d = d {
950
957
outputFile = Just f
951
958
#endif
952
959
}
960
+
961
+ #if MIN_VERSION_ghc(9,2,0)
962
+ isSubspanOfA :: GHC. LocatedAn la a -> GHC. LocatedAn lb b -> Bool
963
+ isSubspanOfA a b = SrcLoc. isSubspanOf (GHC. getLocA a) (GHC. getLocA b)
964
+ #else
965
+ isSubspanOfA :: Located a -> Located b -> Bool
966
+ isSubspanOfA = isSubspanOf
967
+ #endif
968
+
969
+ #if MIN_VERSION_ghc(9,2,0)
970
+ type LocatedAn a = GHC. LocatedAn a
971
+ #else
972
+ type LocatedAn a = Located
973
+ #endif
974
+
975
+ #if MIN_VERSION_ghc(9,2,0)
976
+ locA = GHC. locA
977
+ #else
978
+ locA = id
979
+ #endif
980
+
981
+ #if MIN_VERSION_ghc(9,2,0)
982
+ getLocA = GHC. getLocA
983
+ #else
984
+ getLocA = GHC. getLoc
985
+ #endif
986
+
987
+ #if MIN_VERSION_ghc(9,2,0)
988
+ type AnnListItem = GHC. AnnListItem
989
+ #else
990
+ type AnnListItem = SrcLoc. SrcSpan
991
+ #endif
992
+
993
+ #if MIN_VERSION_ghc(9,2,0)
994
+ type NameAnn = GHC. NameAnn
995
+ #else
996
+ type NameAnn = SrcLoc. SrcSpan
997
+ #endif
0 commit comments