code compiles after changes

Author: winitzki

dhall-lsp-server/src/Dhall/LSP/Backend/Formatting.hs

@@ -3,7 +3,7 @@ module Dhall.LSP.Backend.Formatting (formatExpr, formatExprWithHeader) where
 import Data.Text    (Text)
 import Dhall.Core   (Expr)
 import Dhall.Parser (Header (..))
-import Dhall.Pretty (CharacterSet (..))
+import Dhall.Pretty (ChooseCharacterSet (..), chooseCharsetOrUseDefault)
 import Dhall.Src    (Src)
 
 import qualified Dhall.Pretty

dhall-lsp-server/src/Dhall/LSP/Backend/Parsing.hs

@@ -24,6 +24,7 @@ import Dhall.Core
 import Dhall.Parser
 import Dhall.Parser.Expression (importHash_, importType_, localOnly)
 import Dhall.Parser.Token      hiding (text)
+import Dhall.Pretty ( ChooseCharacterSet(Specify) )   
 import Text.Megaparsec
     ( SourcePos (..)
     , anySingle
@@ -295,7 +296,7 @@ binderExprFromText txt =
           <|> (do cs' <- skipManyTill anySingle _arrow; return (cs', holeExpr))
       whitespace
       inner <- parseBinderExpr
-      return (Pi (Just (cs <> cs')) name typ inner)
+      return (Pi (Specify (cs <> cs')) name typ inner)
 
     lambdaBinder = do
       cs <- _lambda
@@ -312,4 +313,4 @@ binderExprFromText txt =
           <|> (do cs' <- skipManyTill anySingle _arrow; return (cs', holeExpr))
       whitespace
       inner <- parseBinderExpr
-      return (Lam (Just (cs <> cs')) (makeFunctionBinding name typ) inner)
+      return (Lam (Specify (cs <> cs')) (makeFunctionBinding name typ) inner)

dhall-lsp-server/src/Dhall/LSP/State.hs

@@ -18,7 +18,7 @@ import Data.Dynamic                     (Dynamic)
 import Data.Map.Strict                  (Map, empty)
 import Data.Text                        (Text)
 import Dhall.LSP.Backend.Dhall          (Cache, DhallError, emptyCache)
-import Dhall.Pretty                     (CharacterSet)
+import Dhall.Pretty                     (ChooseCharacterSet(..))
 import Language.LSP.Server              (LspT)
 
 import qualified Language.LSP.Protocol.Types as J
@@ -43,15 +43,15 @@ data ServerConfig = ServerConfig
   } deriving Show
 
 instance Default ServerConfig where
-  def = ServerConfig { chosenCharacterSet = Nothing }
+  def = ServerConfig { chosenCharacterSet = AutoInferCharSet }
 
 -- We need to derive the FromJSON instance manually in order to provide defaults
 -- for absent fields.
 instance FromJSON ServerConfig where
   parseJSON = withObject "settings" $ \v -> do
     s <- v .: "vscode-dhall-lsp-server"
     flip (withObject "vscode-dhall-lsp-server") s $ \o -> ServerConfig
-      <$> o .:? "character-set" .!= Nothing
+      <$> o .:? "character-set" .!= AutoInferCharSet
 
 data ServerState = ServerState
   { _importCache :: Cache  -- ^ The dhall import cache

dhall-openapi/openapi-to-dhall/Main.hs

@@ -36,7 +36,7 @@ import Dhall.Kubernetes.Types
     )
 import System.FilePath        ((</>))
 
-import Dhall.Pretty.Internal        (ChooseCharacterSet(..))
+import Dhall.Pretty        (ChooseCharacterSet(..))
 
 import qualified Data.List                  as List
 import qualified Data.Map.Strict            as Data.Map

dhall/src/Dhall/Pretty.hs

@@ -12,6 +12,9 @@ module Dhall.Pretty
     , detectCharacterSet
     , prettyCharacterSet
 
+    , ChooseCharacterSet(..)
+    , chooseCharsetOrUseDefault
+
     , Dhall.Pretty.Internal.layout
     , Dhall.Pretty.Internal.layoutOpts
 

dhall/src/Dhall/Pretty/Internal.hs

@@ -115,6 +115,7 @@ import qualified Prettyprinter.Render.String   as Pretty
 import qualified Prettyprinter.Render.Terminal as Terminal
 import qualified Prettyprinter.Render.Text     as Pretty
 import qualified Text.Printf                   as Printf
+import Data.Aeson (Value(Null))
 
 {-| Annotation type used to tag elements in a pretty-printed document for
     syntax highlighting purposes
@@ -173,7 +174,12 @@ instance Semigroup ChooseCharacterSet where
 
 instance Monoid ChooseCharacterSet where
     mempty = AutoInferCharSet
-    
+
+instance FromJSON ChooseCharacterSet where
+    parseJSON Null = pure mempty
+    parseJSON v@(String _) = fmap Specify (parseJSON v)
+    parseJSON v = typeMismatch "String" v
+
 chooseCharsetOrUseDefault :: CharacterSet -> ChooseCharacterSet -> CharacterSet
 chooseCharsetOrUseDefault c chooseCS = case chooseCS of
     AutoInferCharSet -> c