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

Merge pull request #182 from eagletmt/fix-for-ghc-7.7.20140110 

Pretty.showDocWith disappeard at GHC 7.7.20140110
This commit is contained in:
Kazu Yamamoto 2014-01-13 23:24:43 -08:00
parent a2311556b5 b51072f5f0
commit cf0180ed53
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Language/Haskell/GhcMod/Doc.hs
View File

@ -1,9 +1,9 @@
module Language.Haskell.GhcMod.Doc where module Language.Haskell.GhcMod.Doc where
import DynFlags (DynFlags) import DynFlags (DynFlags)
import Language.Haskell.GhcMod.Gap (withStyle) import Language.Haskell.GhcMod.Gap (withStyle, showDocWith)
import Outputable import Outputable
import Pretty import Pretty (Mode(..))
---------------------------------------------------------------- ----------------------------------------------------------------
@ -27,17 +27,17 @@ styleUnqualified = mkUserStyle neverQualify AllTheWay
-- For "ghc-mod type" -- For "ghc-mod type"
showQualifiedPage :: DynFlags -> SDoc -> String showQualifiedPage :: DynFlags -> SDoc -> String
showQualifiedPage dflag = showDocWith PageMode . withStyle dflag styleQualified showQualifiedPage dflag = showDocWith dflag PageMode . withStyle dflag styleQualified
-- For "ghc-mod browse" and show GHC's error messages. -- For "ghc-mod browse" and show GHC's error messages.
showUnqualifiedPage :: DynFlags -> SDoc -> String showUnqualifiedPage :: DynFlags -> SDoc -> String
showUnqualifiedPage dflag = Pretty.showDocWith Pretty.PageMode showUnqualifiedPage dflag = showDocWith dflag PageMode
. withStyle dflag styleUnqualified . withStyle dflag styleUnqualified
-- Not used -- Not used
showQualifiedOneLine :: DynFlags -> SDoc -> String showQualifiedOneLine :: DynFlags -> SDoc -> String
showQualifiedOneLine dflag = showDocWith OneLineMode . withStyle dflag styleQualified showQualifiedOneLine dflag = showDocWith dflag OneLineMode . withStyle dflag styleQualified
-- To write Haskell code in a buffer -- To write Haskell code in a buffer
showUnqualifiedOneLine :: DynFlags -> SDoc -> String showUnqualifiedOneLine :: DynFlags -> SDoc -> String
showUnqualifiedOneLine dflag = showDocWith OneLineMode . withStyle dflag styleUnqualified showUnqualifiedOneLine dflag = showDocWith dflag OneLineMode . withStyle dflag styleUnqualified

10
Language/Haskell/GhcMod/Gap.hs
View File

@ -26,6 +26,7 @@ module Language.Haskell.GhcMod.Gap (
#else #else
, module Pretty , module Pretty
#endif #endif
, showDocWith
) where ) where
import Control.Applicative hiding (empty) import Control.Applicative hiding (empty)
@ -110,6 +111,15 @@ setLogAction df f =
df { log_action = f df } df { log_action = f df }
#endif #endif
showDocWith :: DynFlags -> Pretty.Mode -> Pretty.Doc -> String
#if __GLASGOW_HASKELL__ >= 707
-- Pretty.showDocWith disappeard.
-- https://github.com/ghc/ghc/commit/08a3536e4246e323fbcd8040e0b80001950fe9bc
showDocWith dflags mode = Pretty.showDoc mode (pprCols dflags)
#else
showDocWith _ = Pretty.showDocWith
#endif
---------------------------------------------------------------- ----------------------------------------------------------------
---------------------------------------------------------------- ----------------------------------------------------------------