Skip to content

Commit ff701a2

Browse files
committed
Fix compile on 8.10
1 parent 3fec58d commit ff701a2

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ isSubspanOfA :: GHC.LocatedAn la a -> GHC.LocatedAn lb b -> Bool
963963
isSubspanOfA a b = SrcLoc.isSubspanOf (GHC.getLocA a) (GHC.getLocA b)
964964
#else
965965
isSubspanOfA :: Located a -> Located b -> Bool
966-
isSubspanOfA = isSubspanOf
966+
isSubspanOfA a b = SrcLoc.isSubspanOf (GHC.getLoc a) (GHC.getLoc b)
967967
#endif
968968

969969
#if MIN_VERSION_ghc(9,2,0)
@@ -981,6 +981,7 @@ locA = id
981981
#if MIN_VERSION_ghc(9,2,0)
982982
getLocA = GHC.getLocA
983983
#else
984+
getLocA :: HasSrcSpan a => a -> SrcSpan
984985
getLocA = GHC.getLoc
985986
#endif
986987

ghcide/src/Development/IDE/GHC/ExactPrint.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ annotate :: (ASTElement l ast, Outputable l)
510510
#if MIN_VERSION_ghc(9,2,0)
511511
=> DynFlags -> Bool -> LocatedAn l ast -> TransformT (Either String) (LocatedAn l ast)
512512
#else
513-
=> DynFlags -> Bool -> LocatedAn l ast -> TransformT (Either String) (_, LocatedAn l ast)
513+
=> DynFlags -> Bool -> LocatedAn l ast -> TransformT (Either String) (Anns, LocatedAn l ast)
514514
#endif
515515
annotate dflags needs_space ast = do
516516
uniq <- show <$> uniqueSrcSpanT
@@ -601,5 +601,5 @@ eqSrcSpanA :: SrcAnn la -> SrcAnn b -> Bool
601601
eqSrcSpanA l r = leftmost_smallest (locA l) (locA r) == EQ
602602
#else
603603
eqSrcSpanA :: SrcSpan -> SrcSpan -> Bool
604-
eqSrcSpan l r = leftmost_smallest l r == EQ
604+
eqSrcSpanA l r = leftmost_smallest l r == EQ
605605
#endif

ghcide/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ appendConstraint constraintT = go
173173
]
174174
return $ L lTop $ HsQualTy noExtField context (L l other)
175175

176-
liftParseAST :: ASTElement ast => DynFlags -> String -> TransformT (Either String) (Located ast)
176+
liftParseAST :: forall ast l. ASTElement l ast => DynFlags -> String -> TransformT (Either String) (Located ast)
177177
liftParseAST df s = case parseAST df "" s of
178178
Right (anns, x) -> modifyAnnsT (anns <>) $> x
179179
Left _ -> lift $ Left $ "No parse: " <> s

0 commit comments

Comments
 (0)