@@ -23,19 +23,19 @@ import Control.Error
23import Control.Lens hiding (enum, lens)
23import Control.Lens hiding (enum, lens)
24import qualified Data.ByteString.Char8 as C8
24import qualified Data.ByteString.Char8 as C8
25import qualified Data.ByteString.Lazy.Builder as LBB
25import qualified Data.ByteString.Lazy.Builder as LBB
26−import qualified Data.ByteString.Lazy.Char8 as LBS
27import Data.Char (isSpace)
26import Data.Char (isSpace)
28import qualified Data.HashMap.Strict as Map
27import qualified Data.HashMap.Strict as Map
29import Data.Maybe
28import Data.Maybe
30import Data.Semigroup ((<>))
29import Data.Semigroup ((<>))
31import Data.String
30import Data.String
32import qualified Data.Text.Lazy as LText
31import qualified Data.Text.Lazy as LText
32+import qualified Data.Text.Lazy.Encoding as LText
33import Gen.AST.Solve (getSolved)
33import Gen.AST.Solve (getSolved)
34import Gen.Formatting
34import Gen.Formatting
35import Gen.Syntax
35import Gen.Syntax
36import Gen.Types
36import Gen.Types
37−import HIndent
37+import qualified HIndent
38−import HIndent.Types
38+import qualified HIndent.Types as HIndent
39import Language.Haskell.Exts.Build (name)
39import Language.Haskell.Exts.Build (name)
40import Language.Haskell.Exts.Pretty as PP
40import Language.Haskell.Exts.Pretty as PP
41import Prelude hiding (sum)
41import Prelude hiding (sum)
@@ -172,10 +172,10 @@ data PP
173pp :: (Pretty a, Show a) => PP -> a -> AST Rendered
173pp :: (Pretty a, Show a) => PP -> a -> AST Rendered
175− | i == Indent = result (reformat hindentConfig Nothing Nothing p)
175+ | i == Indent = result (HIndent.reformat HIndent.defaultConfig Nothing Nothing p)
176 | otherwise = pure (LText.pack (C8.unpack p))
176 | otherwise = pure (LText.pack (C8.unpack p))
178− result = hoistEither . bimap (e . LText.pack) (LText.pack . LBS.unpack . LBB.toLazyByteString)
178+ result = hoistEither . bimap (e . LText.pack) (LText.decodeUtf8 . LBB.toLazyByteString)
180 e = flip mappend ("\nSyntax:\n" <> LText.pack (C8.unpack p) <> "\nAST:\n" <> LText.pack (show x))
180 e = flip mappend ("\nSyntax:\n" <> LText.pack (C8.unpack p) <> "\nAST:\n" <> LText.pack (show x))
@@ -183,11 +183,6 @@ pp i x
183 . C8.pack
183 . C8.pack
184 $ prettyPrintStyleMode s m x
184 $ prettyPrintStyleMode s m x
186− hindentConfig = defaultConfig
187− { configTrailingNewline = False
188− , configSortImports = False
191 s = style
186 s = style
192 { mode = PageMode
187 { mode = PageMode
193 , lineLength = 80
188 , lineLength = 80