Format usage line (fix #45).

pcapriotti · Oct 14, 2013 · 825a43e · 825a43e
1 parent b952989
commit 825a43e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Options/Applicative/Extra.hs b/Options/Applicative/Extra.hs
@@ -158,4 +158,4 @@ usage :: ParserPrefs -> Parser a -> String -> Doc
 usage pprefs p progn = hsep $
   [ string "Usage:"
   , string progn
-  , extract (briefDesc pprefs p) ]
+  , align (extract (briefDesc pprefs p)) ]
diff --git a/Options/Applicative/Help/Chunk.hs b/Options/Applicative/Help/Chunk.hs
@@ -4,6 +4,7 @@ module Options.Applicative.Help.Chunk
   , chunked
   , listToChunk
   , (<<+>>)
+  , (<</>>)
   , vcatChunks
   , vsepChunks
   , isEmpty
@@ -76,6 +77,11 @@ duplicate = fmap pure
 (<<+>>) :: Chunk Doc -> Chunk Doc -> Chunk Doc
 (<<+>>) = chunked (<+>)
 
+-- | Concatenates two 'Chunk's with a softline in between.  This is exactly like
+-- '(<<+>>)', but uses a softline instead of a space.
+(<</>>) :: Chunk Doc -> Chunk Doc -> Chunk Doc
+(<</>>) = chunked (</>)
+
 vcatChunks :: [Chunk Doc] -> Chunk Doc
 vcatChunks = foldr (chunked (.$.)) mempty
 

diff --git a/Options/Applicative/Help/Core.hs b/Options/Applicative/Help/Core.hs
@@ -77,15 +77,15 @@ briefDesc pprefs = fold_tree . treeMapParser (optDesc pprefs style)
       , descSurround = True }
 
     fold_tree (Leaf x) = x
-    fold_tree (MultNode xs) = foldr (<<+>>) mempty . map fold_tree $ xs
+    fold_tree (MultNode xs) = foldr (<</>>) mempty . map fold_tree $ xs
     fold_tree (AltNode xs) = alt_node
                            . filter (not . isEmpty)
                            . map fold_tree $ xs
 
     alt_node :: [Chunk Doc] -> Chunk Doc
     alt_node [n] = n
     alt_node ns = fmap parens
-                . foldr (chunked (mappendWith (string " | "))) mempty
+                . foldr (chunked (\x y -> x </> char '|' </> y)) mempty
                 $ ns
 
 -- | Generate a full help text for a parser.