haskell-tools-debug 0.4.1.3 → 0.5.0.0

raw patch · 5 files changed

+41/−36 lines, 5 filesdep ~ghcdep ~haskell-tools-astdep ~haskell-tools-backend-ghc

Dependency ranges changed: ghc, haskell-tools-ast, haskell-tools-backend-ghc, haskell-tools-debug, haskell-tools-prettyprint, haskell-tools-refactor

Files

• Language/Haskell/Tools/Debug.hs +9/−9
• Language/Haskell/Tools/DebugGhcAST.hs +18/−13
• Language/Haskell/Tools/RangeDebug.hs +4/−5
• Language/Haskell/Tools/RangeDebug/Instances.hs +4/−3
• haskell-tools-debug.cabal +6/−6

@@ -3,23 +3,23 @@             #-}
 module Language.Haskell.Tools.Debug where
 
-import Control.Monad.IO.Class
-import GHC.Generics hiding (moduleName)
-import Data.Maybe
+import Control.Monad.IO.Class (MonadIO(..))
+import Data.Maybe (Maybe(..), fromJust)
+import GHC.Generics (Generic(..))
 
 import GHC hiding (loadModule)
 import GHC.Paths ( libdir )
 
-import Language.Haskell.Tools.AST
+import Language.Haskell.Tools.AST (NodeInfo(..))
 import Language.Haskell.Tools.AST.FromGHC
-import Language.Haskell.Tools.Transform
-import Language.Haskell.Tools.PrettyPrint
 import Language.Haskell.Tools.DebugGhcAST ()
-import Language.Haskell.Tools.RangeDebug
+import Language.Haskell.Tools.PrettyPrint (prettyPrint)
+import Language.Haskell.Tools.RangeDebug (srcInfoDebug)
 import Language.Haskell.Tools.RangeDebug.Instances ()
+import Language.Haskell.Tools.Refactor.Perform (performCommand, readCommand)
 import Language.Haskell.Tools.Refactor.Prepare
-import Language.Haskell.Tools.Refactor.Perform
-import Language.Haskell.Tools.Refactor.RefactorBase
+import Language.Haskell.Tools.Refactor.RefactorBase (RefactorChange(..), IsBoot(..), SourceFileKey(..))
+import Language.Haskell.Tools.Transform
 
 -- | Should be only used for testing
 demoRefactor :: String -> String -> [String] -> String -> IO ()

@@ -7,22 +7,22 @@ 
 import Language.Haskell.Tools.AST (shortShowSpan)
 
-import GHC
-import Module
-import Coercion
-import RdrName
+import Bag (bagToList, Bag(..))
 import BasicTypes
-import Outputable
+import BooleanFormula (BooleanFormula(..))
+import Coercion (Var(..), Role(..))
+import ConLike (ConLike(..))
+import CoreSyn (Tickish(..))
+import FieldLabel (FieldLbl(..))
 import ForeignCall
-import ConLike
-import PatSyn
+import GHC
+import Module (UnitId(..), Module(..), ModuleName(..))
+import OccName (OccName(..))
+import Outputable (Outputable(..), OutputableBndr(..), showSDocUnsafe)
+import PatSyn (PatSyn(..))
+import RdrName (RdrName(..))
 import TcEvidence
-import Bag
-import BooleanFormula
-import FieldLabel
-import CoreSyn
-import UniqFM
-import OccName
+import UniqFM (UniqFM(..))
 
 instance Show a => Show (Located a) where
   show (L l a) = "L(" ++ shortShowSpan l ++ ") (" ++ show a ++ ")"
@@ -70,6 +70,7 @@ deriving instance Show (HsRecFields RdrName (LPat RdrName))
 deriving instance Show (HsRecordBinds RdrName)
 deriving instance Show (HsSplice RdrName)
+deriving instance Show (HsSplicedThing RdrName)
 deriving instance Show (HsStmtContext RdrName)
 deriving instance Show (HsTupArg RdrName)
 deriving instance Show (HsTyVarBndr RdrName)
@@ -147,6 +148,7 @@ deriving instance Show (HsRecFields Name (LPat Name))
 deriving instance Show (HsRecordBinds Name)
 deriving instance Show (HsSplice Name)
+deriving instance Show (HsSplicedThing Name)
 deriving instance Show (HsStmtContext Name)
 deriving instance Show (HsTupArg Name)
 deriving instance Show (HsTyVarBndr Name)
@@ -224,6 +226,7 @@ deriving instance Show (HsRecFields Id (LPat Id))
 deriving instance Show (HsRecordBinds Id)
 deriving instance Show (HsSplice Id)
+deriving instance Show (HsSplicedThing Id)
 deriving instance Show (HsStmtContext Id)
 deriving instance Show (HsTupArg Id)
 deriving instance Show (HsTyVarBndr Id)
@@ -358,3 +361,5 @@ instance Show a => Show (Bag a) where
   show = show . bagToList
 
+instance Show ThModFinalizers where
+  show _ = ""

@@ -9,12 +9,11 @@ -- | A module for displaying debug info about the source annotations of the syntax tree in different phases.
 module Language.Haskell.Tools.RangeDebug where
 
+import Control.Reference ()
 import GHC.Generics
-import Control.Reference
-import SrcLoc
-import Language.Haskell.Tools.AST
-import Language.Haskell.Tools.AST.FromGHC
-import Language.Haskell.Tools.Transform
+import Language.Haskell.Tools.AST (SourceInfo(..), Domain(..))
+import Language.Haskell.Tools.AST.FromGHC ()
+import Language.Haskell.Tools.Transform ()
 
 srcInfoDebug :: TreeDebug e dom st => e dom st -> String
 srcInfoDebug = treeDebug' 0

@@ -7,10 +7,10 @@            #-}
 module Language.Haskell.Tools.RangeDebug.Instances where
 
-import Language.Haskell.Tools.RangeDebug
+import Language.Haskell.Tools.RangeDebug (TreeDebug(..))
 
-import GHC.Generics
-import Control.Reference
+import Control.Reference ((^.))
+import GHC.Generics (Generic(..))
 
 import Language.Haskell.Tools.AST
 
@@ -112,6 +112,7 @@ instance (SourceInfo st, Domain dom) => TreeDebug UCmd dom st
 instance (SourceInfo st, Domain dom) => TreeDebug ULanguageExtension dom st
 instance (SourceInfo st, Domain dom) => TreeDebug UMatchLhs dom st
+instance (SourceInfo st, Domain dom) => TreeDebug UInlinePragma dom st
 
 -- ULiteral
 instance (SourceInfo st, Domain dom) => TreeDebug ULiteral dom st

@@ -1,5 +1,5 @@ name:                haskell-tools-debug
-version:             0.4.1.3
+version:             0.5.0.0
 synopsis:            Debugging Tools for Haskell-tools
 description:         Debugging Tools for Haskell-tools
 homepage:            https://github.com/haskell-tools/haskell-tools
@@ -21,15 +21,15 @@                      , references                >= 0.3 && < 0.4
                      , ghc                       >= 8.0 && < 8.1
                      , ghc-paths                 >= 0.1 && < 0.2
-                     , haskell-tools-ast         >= 0.4 && < 0.5
-                     , haskell-tools-backend-ghc >= 0.4 && < 0.5
-                     , haskell-tools-refactor    >= 0.4 && < 0.5
-                     , haskell-tools-prettyprint >= 0.4 && < 0.5
+                     , haskell-tools-ast         >= 0.5 && < 0.6
+                     , haskell-tools-backend-ghc >= 0.5 && < 0.6
+                     , haskell-tools-refactor    >= 0.5 && < 0.6
+                     , haskell-tools-prettyprint >= 0.5 && < 0.6
   default-language:    Haskell2010
   
 executable ht-debug
   build-depends:       base                      >= 4.9 && < 5.0
-                     , haskell-tools-debug       >= 0.4 && < 0.5
+                     , haskell-tools-debug       >= 0.5 && < 0.6
   hs-source-dirs:      exe
   main-is:             Main.hs
   default-language:    Haskell2010