summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2016-02-02 09:44:07 +0100
committerJasper Van der Jeugt <m@jaspervdj.be>2016-02-02 09:44:07 +0100
commitb2c8ff221ac9e2db22e1ee13852100dc35870eb3 (patch)
tree1bf9cbcf4f3bfb3402b8be00d8e4099c4ffe5d25
parent8a82fecdf812be7f54f9a00882cd69ddac482d66 (diff)
downloadstylish-haskell-b2c8ff221ac9e2db22e1ee13852100dc35870eb3.tar.gz
Fix haddock syntax error0.5.15.1
Fixes #98
-rw-r--r--CHANGELOG3
-rw-r--r--lib/Language/Haskell/Stylish/Config.hs2
-rw-r--r--stylish-haskell.cabal2
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 81fa980..7031742 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+- 0.5.15.1
+ * Fix error that caused haddock to bail on this package
+
- 0.5.15.0
* Add new options for import list alignment (by Ondřej Janošík)
diff --git a/lib/Language/Haskell/Stylish/Config.hs b/lib/Language/Haskell/Stylish/Config.hs
index b7353aa..ccc29be 100644
--- a/lib/Language/Haskell/Stylish/Config.hs
+++ b/lib/Language/Haskell/Stylish/Config.hs
@@ -167,8 +167,8 @@ parseImports config o = Imports.step
<*> (o A..:? "list_align" >>= parseEnum listAligns Imports.AfterAlias)
<*> (o A..:? "long_list_align"
>>= parseEnum longListAligns Imports.Inline)
+ -- Note that padding has to be at least 1. Default is 4.
<*> (maybe 4 (max 1) <$> o A..:? "list_padding")
- -- ^ Padding have to be at least 1. Default is 4.
<*> o A..:? "separate_lists" A..!= True)
where
aligns =
diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal
index 83e8e76..5f14979 100644
--- a/stylish-haskell.cabal
+++ b/stylish-haskell.cabal
@@ -1,5 +1,5 @@
Name: stylish-haskell
-Version: 0.5.15.0
+Version: 0.5.15.1
Synopsis: Haskell code prettifier
Homepage: https://github.com/jaspervdj/stylish-haskell
License: BSD3