Fix for-hackage rendering to distinguish NoFlag and default case.

This commit fixes one instances of a general bug where noFlag
command line flags do not translate correctly when converted
into the field description format (and in fact, cannot be
converted correctly.)

The bug goes something like this:

1. A noArg command line parser translates into a "choice"
   command line parser, for which there is only one choice
   (the flag that would be set when you toggle it on.)

2. Choice command line parsers get translated into the field
   format by having a rendering for each defined choice,
   and then default to empty (omit the field entirely) if
   no choices apply.

3. This means that NoFlag and the "default choice" (if you
   hadn't specified the flag at all) render identically,
   because there is never a choice for the default choice
   in the no arg field.

In the interest of getting this to work, I manually made
for-hackage work correctly, but there is probably a way to
refactor this into a more universal fix.

CC @dcoutts

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Author: ezyang

Cabal/Distribution/Simple/Setup.hs

@@ -1480,6 +1480,13 @@ data HaddockTarget = ForHackage | ForDevelopment deriving (Eq, Show, Generic)
 
 instance Binary HaddockTarget
 
+instance Text HaddockTarget where
+    disp ForHackage     = Disp.text "for-hackage"
+    disp ForDevelopment = Disp.text "for-development"
+
+    parse = Parse.choice [ Parse.string "for-hackage"     >> return ForHackage
+                         , Parse.string "for-development" >> return ForDevelopment]
+
 data HaddockFlags = HaddockFlags {
     haddockProgramPaths :: [(String, FilePath)],
     haddockProgramArgs  :: [(String, [String])],

cabal-install/Distribution/Client/ProjectConfig/Legacy.hs

@@ -953,12 +953,18 @@ legacyPackageConfigFieldDescrs =
       (\flags conf -> conf { legacyHaddockFlags = flags })
   . mapFieldNames
       ("haddock-"++)
+  . addFields
+      [ simpleField "for-hackage"
+          -- TODO: turn this into a library function
+          (fromFlagOrDefault Disp.empty . fmap disp) (Parse.option mempty (fmap toFlag parse))
+          haddockForHackage (\v conf -> conf { haddockForHackage = v })
+      ]
   . filterFields
       [ "hoogle", "html", "html-location"
       , "foreign-libraries"
       , "executables", "tests", "benchmarks", "all", "internal", "css"
       , "hyperlink-source", "hscolour-css"
-      , "contents-location", "keep-temp-files", "for-hackage"
+      , "contents-location", "keep-temp-files"
       ]
   . commandOptionsToFields
   ) (haddockOptions ParseArgs)

cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs

@@ -503,7 +503,7 @@ instance Arbitrary PackageConfig where
                          . Map.mapKeys getNoShrink
 
 instance Arbitrary HaddockTarget where
-    arbitrary = elements [ForHackage]
+    arbitrary = elements [ForHackage, ForDevelopment]
 
 instance Arbitrary SourceRepo where
     arbitrary = (SourceRepo RepoThis