Concatenate subparser help texts vertically (fixes #93).

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 - Added low-level function to handle parse results (pull request \#94).
 
+- Fixed bugs
+    * \#93 - Formatting problem for several sub-parsers
+
 ## Version 0.9.0 (23 May 2014)
 
 - The option returned by `abortOption` is now visible by default.

Options/Applicative/Help/Core.hs

@@ -61,7 +61,7 @@ optDesc pprefs style info opt =
 
 -- | Generate descriptions for commands.
 cmdDesc :: Parser a -> Chunk Doc
-cmdDesc = mconcat . mapParser desc
+cmdDesc = vcatChunks . mapParser desc
   where
     desc _ opt =
       case optMain opt of

tests/Tests.hs

@@ -403,6 +403,17 @@ case_issue_52 = do
     let text = head . lines . fst . err $ "test"
     "Usage: test FOO" @=? text
 
+case_multiple_subparsers :: Assertion
+case_multiple_subparsers = do
+  let p1 = subparser
+        (command "add" (info (pure ())
+             ( progDesc "Add a file to the repository" )))
+      p2 = subparser
+        (command "commit" (info (pure ())
+             ( progDesc "Record changes to the repository" )))
+      i = info (p1 *> p2 <**> helper) idm
+  checkHelpText "subparsers" i ["--help"]
+
 ---
 
 deriving instance Arbitrary a => Arbitrary (Chunk a)

tests/subparsers.err.txt

@@ -0,0 +1,8 @@
+Usage: subparsers COMMAND COMMAND
+
+Available options:
+  -h,--help                Show this help text
+
+Available commands:
+  add                      Add a file to the repository
+  commit                   Record changes to the repository