haddock-project fixes (backport #8919)

.gitignore

@@ -68,6 +68,7 @@ register.sh
 # windows test artifacts
 cabal-testsuite/**/*.exe
 cabal-testsuite/**/*.bat
+cabal-testsuite/**/haddocks
 
 # python artifacts from documentation builds
 *.pyc

Cabal/src/Distribution/Simple/Haddock.hs

@@ -358,10 +358,10 @@ createHaddockIndex :: Verbosity
                    -> HaddockProjectFlags
                    -> IO ()
 createHaddockIndex verbosity programDb comp platform flags = do
-    let args = fromHaddockProjectFlags flags
-    (haddockProg, _version) <-
-      getHaddockProg verbosity programDb comp args (haddockProjectQuickJump flags)
-    runHaddock verbosity defaultTempFileOptions comp platform haddockProg False args
+  let args = fromHaddockProjectFlags flags
+  (haddockProg, _version) <-
+    getHaddockProg verbosity programDb comp args (Flag True)
+  runHaddock verbosity defaultTempFileOptions comp platform haddockProg False args
 
 -- ------------------------------------------------------------------------------
 -- Contributions to HaddockArgs (see also Doctest.hs for very similar code).
@@ -403,17 +403,16 @@ fromFlags env flags =
 
 fromHaddockProjectFlags :: HaddockProjectFlags -> HaddockArgs
 fromHaddockProjectFlags flags =
-    mempty
-      { argOutputDir = Dir (fromFlag $ haddockProjectDir flags)
-      , argQuickJump = haddockProjectQuickJump flags
-      , argGenContents = haddockProjectGenContents flags
-      , argGenIndex = haddockProjectGenIndex flags
-      , argPrologueFile = haddockProjectPrologue flags
-      , argInterfaces = fromFlagOrDefault [] (haddockProjectInterfaces flags)
-      , argLinkedSource = haddockProjectLinkedSource flags
-      , argLib = haddockProjectLib flags
-      }
-
+  mempty
+    { argOutputDir = Dir (fromFlag $ haddockProjectDir flags)
+    , argQuickJump = Flag True
+    , argGenContents = Flag True
+    , argGenIndex = Flag True
+    , argPrologueFile = haddockProjectPrologue flags
+    , argInterfaces = fromFlagOrDefault [] (haddockProjectInterfaces flags)
+    , argLinkedSource = Flag True
+    , argLib = haddockProjectLib flags
+    }
 
 fromPackageDescription :: HaddockTarget -> PackageDescription -> HaddockArgs
 fromPackageDescription haddockTarget pkg_descr = mempty
@@ -677,22 +676,30 @@ renderArgs verbosity tmpFileOpts version comp platform args k = do
             (if haddockSupportsUTF8 then Just utf8 else Nothing)
             renderedArgs
             (\responseFileName -> k (["@" ++ responseFileName], result))
-        else
-          k (renderedArgs, result)
-    where
-      outputDir = (unDir $ argOutputDir args)
-      result = intercalate ", "
-             . map (\o -> outputDir </>
-                            case o of
-                              Html -> "index.html"
-                              Hoogle -> pkgstr <.> "txt")
-             . fromFlagOrDefault [Html]
-             . argOutput
-             $ args
-            where
-              pkgstr = prettyShow $ packageName pkgid
-              pkgid = arg argPackageName
-      arg f = fromFlag $ f args
+        else k (renderedArgs, result)
+  where
+    outputDir = (unDir $ argOutputDir args)
+    result =
+      intercalate ", "
+        . map
+          ( \o ->
+              outputDir
+                </> case o of
+                  Html
+                    | fromFlagOrDefault False (argGenIndex args) ->
+                        "index.html"
+                  Html
+                    | otherwise ->
+                        mempty
+                  Hoogle -> pkgstr <.> "txt"
+          )
+        . fromFlagOrDefault [Html]
+        . argOutput
+        $ args
+      where
+        pkgstr = prettyShow $ packageName pkgid
+        pkgid = arg argPackageName
+    arg f = fromFlag $ f args
 
 renderPureArgs :: Version -> Compiler -> Platform -> HaddockArgs -> [String]
 renderPureArgs version comp platform args = concat