Monad.hs is now exported by GhcMod.hs.

Language/Haskell/GhcMod.hs

@@ -15,6 +15,7 @@ module Language.Haskell.GhcMod (
   , GhcPkgDb
   , Symbol
   , SymbolDb
+  , module Language.Haskell.GhcMod.Monad
   -- * 'GhcMod' utilities
   , boot
   , browse
@@ -41,16 +42,17 @@ module Language.Haskell.GhcMod (
 
 import Language.Haskell.GhcMod.Boot
 import Language.Haskell.GhcMod.Browse
+import Language.Haskell.GhcMod.CaseSplit
 import Language.Haskell.GhcMod.Check
 import Language.Haskell.GhcMod.Cradle
 import Language.Haskell.GhcMod.Debug
+import Language.Haskell.GhcMod.FillSig
 import Language.Haskell.GhcMod.Find
 import Language.Haskell.GhcMod.Flag
 import Language.Haskell.GhcMod.Info
 import Language.Haskell.GhcMod.Lang
 import Language.Haskell.GhcMod.Lint
 import Language.Haskell.GhcMod.List
+import Language.Haskell.GhcMod.Monad
 import Language.Haskell.GhcMod.PkgDoc
-import Language.Haskell.GhcMod.FillSig
-import Language.Haskell.GhcMod.CaseSplit
 import Language.Haskell.GhcMod.Types

Language/Haskell/GhcMod/Lint.hs

@@ -6,6 +6,7 @@ import CoreMonad (liftIO)
 import Language.Haskell.GhcMod.Logger (checkErrorPrefix)
 import Language.Haskell.GhcMod.Convert
 import Language.Haskell.GhcMod.Monad
+import Language.Haskell.GhcMod.Types
 import Language.Haskell.HLint (hlint)
 
 -- | Checking syntax of a target file using hlint.

Language/Haskell/GhcMod/List.hs

@@ -4,8 +4,9 @@ import Control.Applicative ((<$>))
 import Control.Exception (SomeException(..))
 import Data.List (nub, sort)
 import qualified GHC as G
-import Language.Haskell.GhcMod.Monad
 import Language.Haskell.GhcMod.Convert
+import Language.Haskell.GhcMod.Monad
+import Language.Haskell.GhcMod.Types
 import Packages (pkgIdMap, exposedModules, sourcePackageId, display)
 import UniqFM (eltsUFM)
 

Language/Haskell/GhcMod/Logger.hs

@@ -21,6 +21,7 @@ import Language.Haskell.GhcMod.DynFlags (withDynFlags, withCmdFlags)
 import qualified Language.Haskell.GhcMod.Gap as Gap
 import Language.Haskell.GhcMod.Convert (convert')
 import Language.Haskell.GhcMod.Monad
+import Language.Haskell.GhcMod.Types
 import Outputable (PprStyle, SDoc)
 import System.FilePath (normalise)
 

Language/Haskell/GhcMod/Monad.hs

@@ -5,27 +5,27 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Language.Haskell.GhcMod.Monad (
-   GhcMod
+  -- * Monad Types
- , runGhcMod
+    GhcMod
- , liftGhcMod
+  , GhcModT
- , GhcModT
+  , IOish
- , IOish
+  , GhcModEnv(..)
- , GhcModEnv(..)
+  , GhcModState(..)
- , GhcModWriter
+  , GhcModWriter
- , GhcModState(..)
+  -- * Monad utilities
- , runGhcModT'
+  , runGhcMod
- , runGhcModT
+  , runGhcModT
- , newGhcModEnv
+  , runGhcModT'
- , withErrorHandler
+  , withErrorHandler
- , toGhcMod
+  , liftGhcMod
- , options
+  , toGhcMod
- , cradle
+  , newGhcModEnv
- , Options(..)
+  , options
- , defaultOptions
+  , cradle
- , module Control.Monad.Reader.Class
+  , module Control.Monad.Reader.Class
- , module Control.Monad.Writer.Class
+  , module Control.Monad.Writer.Class
- , module Control.Monad.State.Class
+  , module Control.Monad.State.Class
- ) where
+  ) where
 
 #if __GLASGOW_HASKELL__ < 708
 -- 'CoreMonad.MonadIO' and 'Control.Monad.IO.Class.MonadIO' are different

ghc-mod.cabal

@@ -53,18 +53,17 @@ Library
   GHC-Options:          -Wall
   Default-Extensions:   ConstraintKinds, FlexibleContexts
   Exposed-Modules:      Language.Haskell.GhcMod
-                        Language.Haskell.GhcMod.Monad
                         Language.Haskell.GhcMod.Internal
   Other-Modules:        Language.Haskell.GhcMod.Boot
                         Language.Haskell.GhcMod.Browse
-                        Language.Haskell.GhcMod.CabalApi
-                        Language.Haskell.GhcMod.CabalConfig
                         Language.Haskell.GhcMod.Cabal16
                         Language.Haskell.GhcMod.Cabal18
+                        Language.Haskell.GhcMod.CabalApi
+                        Language.Haskell.GhcMod.CabalConfig
                         Language.Haskell.GhcMod.CaseSplit
                         Language.Haskell.GhcMod.Check
-                        Language.Haskell.GhcMod.Cradle
                         Language.Haskell.GhcMod.Convert
+                        Language.Haskell.GhcMod.Cradle
                         Language.Haskell.GhcMod.Debug
                         Language.Haskell.GhcMod.Doc
                         Language.Haskell.GhcMod.DynFlags
@@ -75,16 +74,17 @@ Library
                         Language.Haskell.GhcMod.GHCChoice
                         Language.Haskell.GhcMod.Gap
                         Language.Haskell.GhcMod.GhcPkg
-                        Language.Haskell.GhcMod.Logger
                         Language.Haskell.GhcMod.Info
                         Language.Haskell.GhcMod.Lang
                         Language.Haskell.GhcMod.Lint
                         Language.Haskell.GhcMod.List
+                        Language.Haskell.GhcMod.Logger
+                        Language.Haskell.GhcMod.Monad
                         Language.Haskell.GhcMod.PkgDoc
-                        Language.Haskell.GhcMod.Utils
-                        Language.Haskell.GhcMod.Types
                         Language.Haskell.GhcMod.Read
                         Language.Haskell.GhcMod.SrcUtils
+                        Language.Haskell.GhcMod.Types
+                        Language.Haskell.GhcMod.Utils
   Build-Depends:        base >= 4.0 && < 5
                       , containers
                       , deepseq

src/GHCMod.hs

@@ -10,7 +10,6 @@ import qualified Control.Exception as E
 import Data.Typeable (Typeable)
 import Data.Version (showVersion)
 import Language.Haskell.GhcMod
-import Language.Haskell.GhcMod.Monad
 import Paths_ghc_mod
 import System.Console.GetOpt (OptDescr(..), ArgDescr(..), ArgOrder(..))
 import qualified System.Console.GetOpt as O

src/GHCModi.hs

@@ -34,7 +34,6 @@ import Data.Version (showVersion)
 import GHC (GhcMonad)
 import qualified GHC as G
 import Language.Haskell.GhcMod
-import Language.Haskell.GhcMod.Monad
 import Paths_ghc_mod
 import System.Console.GetOpt
 import System.Directory (setCurrentDirectory)