hasufell
/
ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hse-1.18' of https://github.com/phadej/ghc-mod

This commit is contained in:
Daniel Gröber 2016-08-08 19:03:18 +02:00
parent 44ff0a8837 afd535df48
commit 5e83a8b2fc
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Language/Haskell/GhcMod/FillSig.hs
View File

@ -27,7 +27,7 @@ import qualified HsBinds as Ty
import qualified Class as Ty import qualified Class as Ty
import qualified Var as Ty import qualified Var as Ty
import qualified HsPat 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 Djinn.GHC
import qualified Language.Haskell.GhcMod.Gap as Gap import qualified Language.Haskell.GhcMod.Gap as Gap
@ -191,7 +191,7 @@ getSignatureFromHE file lineNo colNo = do
HE.TypeSig (HE.SrcSpanInfo s _) names ty -> HE.TypeSig (HE.SrcSpanInfo s _) names ty ->
return $ HESignature 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 let (name, tys) = dHeadTyVars declHead in
return $ HEFamSignature s Open name (map cleanTyVarBind tys) return $ HEFamSignature s Open name (map cleanTyVarBind tys)

4
Language/Haskell/GhcMod/SrcUtils.hs
View File

@ -16,7 +16,7 @@ import qualified Var as G
import qualified Type as G import qualified Type as G
import GHC.SYB.Utils import GHC.SYB.Utils
import GhcMonad 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.Doc
import Language.Haskell.GhcMod.Gap import Language.Haskell.GhcMod.Gap
import qualified Language.Haskell.GhcMod.Gap as 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 :: Int -> Int -> HE.Decl HE.SrcSpanInfo -> Bool
typeSigInRangeHE lineNo colNo (HE.TypeSig (HE.SrcSpanInfo s _) _ _) = typeSigInRangeHE lineNo colNo (HE.TypeSig (HE.SrcSpanInfo s _) _ _) =
HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo) 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) HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
typeSigInRangeHE lineNo colNo (HE.DataFamDecl (HE.SrcSpanInfo s _) _ _ _) = typeSigInRangeHE lineNo colNo (HE.DataFamDecl (HE.SrcSpanInfo s _) _ _ _) =
HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo) HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)

6
ghc-mod.cabal
View File

@ -196,12 +196,12 @@ Library
, mtl < 2.3 && >= 2.0 , mtl < 2.3 && >= 2.0
, monad-control < 1.1 && >= 1 , monad-control < 1.1 && >= 1
, split < 0.3 , split < 0.3
, haskell-src-exts < 1.18 , haskell-src-exts == 1.18.*
, text < 1.3 , text < 1.3
, djinn-ghc < 0.1 && >= 0.0.2.2 , djinn-ghc < 0.1 && >= 0.0.2.2
, fclabels == 2.0.* , fclabels == 2.0.*
, extra == 1.4.* , extra >= 1.4 && <1.6
, pipes == 4.1.* , pipes >= 4.1 && <4.3
, safe < 0.4 && >= 0.3.9 , safe < 0.4 && >= 0.3.9
, optparse-applicative >=0.11.0 && <0.13.0 , optparse-applicative >=0.11.0 && <0.13.0
, template-haskell , template-haskell