Fixing imports and adding Arbitrary instance for tests

Author: winitzki

dhall/src/Dhall/DirectoryTree.hs

@@ -30,6 +30,7 @@ import Data.Text                 (Text)
 import Data.Void                 (Void)
 import Dhall.DirectoryTree.Types
 import Dhall.Marshal.Decode      (Decoder (..), Expector)
+import Dhall.Pretty              (ChooseCharacterSet(..))
 import Dhall.Src                 (Src)
 import Dhall.Syntax
     ( Chunks (..)
@@ -50,7 +51,6 @@ import qualified Dhall.Core                  as Core
 import qualified Dhall.Map                   as Map
 import qualified Dhall.Marshal.Decode        as Decode
 import qualified Dhall.Pretty
-import Dhall.Pretty.Internal        (ChooseCharacterSet(..))
 import qualified Dhall.TypeCheck             as TypeCheck
 import qualified Dhall.Util                  as Util
 import qualified Prettyprinter               as Pretty

dhall/src/Dhall/Format.hs

@@ -11,7 +11,7 @@ module Dhall.Format
 
 import Data.Foldable      (for_)
 import Data.List.NonEmpty (NonEmpty)
-import Dhall.Pretty       (annToAnsiStyle, detectCharacterSet)
+import Dhall.Pretty       (annToAnsiStyle, detectCharacterSet, ChooseCharacterSet(..), chooseCharsetOrUseDefault)
 import Dhall.Util
     ( Censor
     , CheckFailed (..)
@@ -33,7 +33,6 @@ import qualified System.AtomicWrite.Writer.LazyText as AtomicWrite.LazyText
 import qualified System.Console.ANSI
 import qualified System.FilePath
 import qualified System.IO
-import Dhall.Pretty.Internal        (ChooseCharacterSet(..), chooseCharsetOrUseDefault)
 
 -- | Arguments to the `format` subcommand
 data Format = Format

dhall/src/Dhall/Marshal/Encode.hs

@@ -65,6 +65,7 @@ import Control.Monad.Trans.State.Strict
 import Data.Functor.Contravariant           (Contravariant (..), Op (..), (>$<))
 import Data.Functor.Contravariant.Divisible (Divisible (..), divided)
 import Dhall.Parser                         (Src (..))
+import Dhall.Pretty                         (ChooseCharacterSet(..))
 import Dhall.Syntax
     ( Chunks (..)
     , DhallDouble (..)
@@ -94,7 +95,6 @@ import qualified Dhall.Core            as Core
 import qualified Dhall.Map
 
 import Dhall.Marshal.Internal
-import Dhall.Pretty.Internal        (ChooseCharacterSet(..))
 
 -- $setup
 -- >>> :set -XRecordWildCards

dhall/src/Dhall/Pretty/Internal.hs

@@ -177,7 +177,7 @@ instance Monoid ChooseCharacterSet where
 
 instance FromJSON ChooseCharacterSet where
     parseJSON Null = pure mempty
-    parseJSON v@(String _) = fmap Specify (parseJSON v)
+    parseJSON v@(String _) = Specify <$> (parseJSON v)
     parseJSON v = typeMismatch "String" v
 
 chooseCharsetOrUseDefault :: CharacterSet -> ChooseCharacterSet -> CharacterSet

dhall/src/Dhall/Schemas.hs

@@ -20,8 +20,7 @@ import Data.Text           (Text)
 import Data.Void           (Void)
 import Dhall.Crypto        (SHA256Digest)
 import Dhall.Map           (Map)
-import Dhall.Pretty        (detectCharacterSet)
-import Dhall.Pretty.Internal        (ChooseCharacterSet(..), chooseCharsetOrUseDefault)
+import Dhall.Pretty        (detectCharacterSet, ChooseCharacterSet(..), chooseCharsetOrUseDefault)
 import Dhall.Src           (Src)
 import Dhall.Syntax        (Expr (..), Import, Var (..))
 import Dhall.Util

dhall/tests/Dhall/Test/QuickCheck.hs

@@ -60,7 +60,7 @@ import Data.Functor.Identity     (Identity (..))
 import Data.Proxy                (Proxy (..))
 import Data.Typeable             (Typeable, typeRep)
 import Dhall.Parser              (Header (..), createHeader)
-import Dhall.Pretty              (CharacterSet (..))
+import Dhall.Pretty              (CharacterSet (..), ChooseCharacterSet (..))
 import Dhall.Set                 (Set)
 import Dhall.Src                 (Src (..))
 import Dhall.Test.Format         (format)
@@ -215,6 +215,12 @@ shrinkWhitespace _  = [""]
 instance Arbitrary CharacterSet where
     arbitrary = Test.QuickCheck.elements [ ASCII, Unicode ]
 
+instance Arbitrary ChooseCharacterSet where
+    arbitrary = Test.QuickCheck.oneof [
+        return AutoInferCharSet
+        , Specify <$> arbitrary
+     ]
+
 instance Arbitrary Header where
     arbitrary = createHeader <$> whitespace