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

Remove dependency on 'pretty'

Browse Source 
Now using GHC's 'Pretty' module instead
This commit is contained in:
Daniel Gröber
2016-12-13 01:40:05 +01:00
parent e32cb977b7
commit 5d3e5932a7
11 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Language/Haskell/GhcMod/Logging.hs
View File

@@ -20,8 +20,8 @@ module Language.Haskell.GhcMod.Logging (
module Language.Haskell.GhcMod.Logging
, module Language.Haskell.GhcMod.Pretty
, GmLogLevel(..)
, module Text.PrettyPrint
, module Data.Monoid
, module Pretty
) where
import Control.Applicative hiding (empty)
@@ -33,9 +33,10 @@ import Data.Monoid
import Data.Maybe
import System.IO
import System.FilePath
import Text.PrettyPrint hiding (style, (<>))
import Prelude
import Pretty hiding (style, (<>))
import Language.Haskell.GhcMod.Monad.Types
import Language.Haskell.GhcMod.Types
import Language.Haskell.GhcMod.Pretty
@@ -77,7 +78,7 @@ gmLog level loc' doc = do
let loc | loc' == "" = empty
| otherwise = text loc' <+>: empty
msgDoc = sep [loc, doc]
msg = dropWhileEnd isSpace $ gmRenderDoc $ gmLogLevelDoc level <+>: msgDoc
msg = dropWhileEnd isSpace $ render $ gmLogLevelDoc level <+>: msgDoc
when (level <= level') $ gmErrStrLn msg
gmLogQuiet level loc' doc