From 358465511840bae3ff771572586d65dd12fec3bd Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Fri, 13 Jan 2017 13:01:39 +0200 Subject: [PATCH] Update haskell-src-exts, extra, pipes to current As per stackage nightly-2017-01-13 --- Language/Haskell/GhcMod/FillSig.hs | 4 ++-- Language/Haskell/GhcMod/SrcUtils.hs | 4 ++-- ghc-mod.cabal | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Language/Haskell/GhcMod/FillSig.hs b/Language/Haskell/GhcMod/FillSig.hs index 3f7ae4c..3e03ec0 100644 --- a/Language/Haskell/GhcMod/FillSig.hs +++ b/Language/Haskell/GhcMod/FillSig.hs @@ -27,7 +27,7 @@ import qualified HsBinds as Ty import qualified Class as Ty import qualified Var as Ty import qualified HsPat as Ty -import qualified Language.Haskell.Exts.Annotated as HE +import qualified Language.Haskell.Exts as HE import Djinn.GHC import qualified Language.Haskell.GhcMod.Gap as Gap @@ -191,7 +191,7 @@ getSignatureFromHE file lineNo colNo = do HE.TypeSig (HE.SrcSpanInfo s _) names ty -> return $ HESignature s names ty - HE.TypeFamDecl (HE.SrcSpanInfo s _) declHead _ -> + HE.TypeFamDecl (HE.SrcSpanInfo s _) declHead _ _ -> let (name, tys) = dHeadTyVars declHead in return $ HEFamSignature s Open name (map cleanTyVarBind tys) diff --git a/Language/Haskell/GhcMod/SrcUtils.hs b/Language/Haskell/GhcMod/SrcUtils.hs index fb36289..5829fde 100644 --- a/Language/Haskell/GhcMod/SrcUtils.hs +++ b/Language/Haskell/GhcMod/SrcUtils.hs @@ -16,7 +16,7 @@ import qualified Var as G import qualified Type as G import GHC.SYB.Utils import GhcMonad -import qualified Language.Haskell.Exts.Annotated as HE +import qualified Language.Haskell.Exts as HE import Language.Haskell.GhcMod.Doc import Language.Haskell.GhcMod.Gap import qualified Language.Haskell.GhcMod.Gap as Gap @@ -175,7 +175,7 @@ fourIntsHE loc = ( HE.srcSpanStartLine loc, HE.srcSpanStartColumn loc typeSigInRangeHE :: Int -> Int -> HE.Decl HE.SrcSpanInfo -> Bool typeSigInRangeHE lineNo colNo (HE.TypeSig (HE.SrcSpanInfo s _) _ _) = HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo) -typeSigInRangeHE lineNo colNo (HE.TypeFamDecl (HE.SrcSpanInfo s _) _ _) = +typeSigInRangeHE lineNo colNo (HE.TypeFamDecl (HE.SrcSpanInfo s _) _ _ _) = HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo) typeSigInRangeHE lineNo colNo (HE.DataFamDecl (HE.SrcSpanInfo s _) _ _ _) = HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo) diff --git a/ghc-mod.cabal b/ghc-mod.cabal index b909a42..950ac53 100644 --- a/ghc-mod.cabal +++ b/ghc-mod.cabal @@ -195,12 +195,12 @@ Library , mtl < 2.3 && >= 2.0 , monad-control < 1.1 && >= 1 , split < 0.3 - , haskell-src-exts < 1.18 + , haskell-src-exts < 1.19 && >= 1.18 , text < 1.3 , djinn-ghc < 0.1 && >= 0.0.2.2 , fclabels == 2.0.* - , extra == 1.4.* - , pipes == 4.1.* + , extra == 1.5.* + , pipes == 4.3.* , safe < 0.4 && >= 0.3.9 , optparse-applicative >=0.13.0 && <0.14.0 , template-haskell