diff options
| author | vijayphoenix <cs17btech11040@iith.ac.in> | 2020-01-26 14:01:31 +0000 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2020-01-26 14:02:55 +0000 |
| commit | 498d676c1e06af966c814e01967fc3ece1fd9225 (patch) | |
| tree | 088a1bbec731f509a5a4e48a7ce0c9c6c7d0b885 /lib | |
| parent | bb91eb75602153a36927768ccd2f915dc43922f5 (diff) | |
| download | stylish-haskell-498d676c1e06af966c814e01967fc3ece1fd9225.tar.gz | |
Switch to HsYAML library
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Language/Haskell/Stylish/Config.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Language/Haskell/Stylish/Config.hs b/lib/Language/Haskell/Stylish/Config.hs index bd15867..ba9cb31 100644 --- a/lib/Language/Haskell/Stylish/Config.hs +++ b/lib/Language/Haskell/Stylish/Config.hs @@ -16,6 +16,7 @@ import Data.Aeson (FromJSON (..) import qualified Data.Aeson as A import qualified Data.Aeson.Types as A import qualified Data.ByteString as B +import Data.ByteString.Lazy (fromStrict) import Data.Char (toLower) import qualified Data.FileEmbed as FileEmbed import Data.List (intercalate, @@ -23,8 +24,8 @@ import Data.List (intercalate, import Data.Map (Map) import qualified Data.Map as M import Data.Maybe (fromMaybe) -import Data.Yaml (decodeEither', - prettyPrintParseException) +import Data.YAML (prettyPosWithSource) +import Data.YAML.Aeson (decode1Strict) import System.Directory import System.FilePath ((</>)) import qualified System.IO as IO (Newline (..), @@ -101,9 +102,8 @@ loadConfig verbose userSpecified = do mbFp <- configFilePath verbose userSpecified verbose $ "Loading configuration at " ++ fromMaybe "<embedded>" mbFp bytes <- maybe (return defaultConfigBytes) B.readFile mbFp - case decodeEither' bytes of - Left err -> error $ - "Language.Haskell.Stylish.Config.loadConfig: " ++ prettyPrintParseException err + case decode1Strict bytes of + Left (pos, err) -> error $ prettyPosWithSource pos (fromStrict bytes) ("Language.Haskell.Stylish.Config.loadConfig: " ++ err) Right config -> do cabalLanguageExtensions <- if configCabal config then map show <$> Cabal.findLanguageExtensions verbose |