[commit: haddock] ghc-head, ghc-head1, ie_avails, wip/T14529, wip/new-tree-one-param, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: Merge commit '240bc38b94ed2d0af27333b23392d03eeb615e82' into HEAD (606da88)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: ghc-head,ghc-head1,ie_avails,wip/T14529,wip/new-tree-one-param,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/606da884355527051afe0058c2f8b0ac2005e01b

>---------------------------------------------------------------

commit 606da884355527051afe0058c2f8b0ac2005e01b
Merge: 4eb765c 240bc38
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Mar 23 09:25:33 2017 -0400

    Merge commit '240bc38b94ed2d0af27333b23392d03eeb615e82' into HEAD



>---------------------------------------------------------------

606da884355527051afe0058c2f8b0ac2005e01b
 CHANGES                                            |  4 ++
 doc/invoking.rst                                   |  8 +--
 doc/markup.rst                                     | 17 ++++++-
 ghc.mk                                             |  1 -
 haddock-api/haddock-api.cabal                      |  3 +-
 .../resources/html/Ocean.std-theme/ocean.css       |  2 +
 haddock-api/resources/html/frames.html             | 30 -----------
 haddock-api/resources/html/haddock-util.js         | 28 ----------
 haddock-api/src/Haddock.hs                         |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml.hs          | 59 ++++++----------------
 haddock-api/src/Haddock/Convert.hs                 |  1 +
 haddock-api/src/Haddock/Interface/Create.hs        | 16 ++++--
 .../src/Haddock/Interface/ParseModuleHeader.hs     |  2 +-
 haddock-api/src/Haddock/Types.hs                   |  4 +-
 haddock-api/src/Haddock/Utils.hs                   | 12 +----
 haddock-library/haddock-library.cabal              |  2 +-
 .../src/Documentation/Haddock/Parser/Monad.hs      |  2 +-
 Setup.lhs => haddock-test/Setup.lhs                |  0
 haddock-test/haddock-test.cabal                    |  2 +-
 haddock.cabal                                      | 10 ++--
 .../ref/{DeprecatedModule2.html => Bug280.html}    | 39 ++++++++------
 html-test/ref/Test.html                            |  2 +-
 html-test/ref/frames.html                          | 30 -----------
 html-test/ref/haddock-util.js                      | 28 ----------
 html-test/src/Bug280.hs                            | 11 ++++
 25 files changed, 103 insertions(+), 212 deletions(-)

diff --cc haddock-api/src/Haddock/Interface/Create.hs
index cd46831,cb85569..e594fea
--- a/haddock-api/src/Haddock/Interface/Create.hs
+++ b/haddock-api/src/Haddock/Interface/Create.hs
@@@ -883,10 -794,13 +888,13 @@@ extractDecl name dec
            [s0] -> let (n, tyvar_names) = (tcdName d, tyClDeclTyVars d)
                        L pos sig = addClassContext n tyvar_names s0
                    in L pos (SigD sig)
-           _ -> error "internal: extractDecl (ClassDecl)"
+           _ -> O.pprPanic "extractDecl" (O.text "Ambiguous decl for" O.<+> O.ppr name O.<+> O.text "in class:"
+                                          O.$$ O.nest 4 (O.ppr d)
+                                          O.$$ O.text "Matches:"
+                                          O.$$ O.nest 4 (O.ppr matches))
        TyClD d at DataDecl {} ->
          let (n, tyvar_tys) = (tcdName d, lHsQTyVarsToTypes (tyClDeclTyVars d))
 -        in SigD <$> extractRecSel name mdl n tyvar_tys (dd_cons (tcdDataDefn d))
 +        in SigD <$> extractRecSel name n tyvar_tys (dd_cons (tcdDataDefn d))
        InstD (DataFamInstD DataFamInstDecl { dfid_tycon = L _ n
                                            , dfid_pats = HsIB { hsib_body = tys }
                                            , dfid_defn = defn }) ->
@@@ -918,9 -832,9 +926,9 @@@ extractRecSel nm t tvs (L _ con : rest
    matching_fields flds = [ (l,f) | f@(L _ (ConDeclField ns _ _)) <- flds
                                   , L l n <- ns, selectorFieldOcc n == nm ]
    data_ty
-     -- | ResTyGADT _ ty <- con_res con = ty
+     -- ResTyGADT _ ty <- con_res con = ty
      | ConDeclGADT{} <- con = hsib_body $ con_type con
 -    | otherwise = foldl' (\x y -> noLoc (HsAppTy x y)) (noLoc (HsTyVar (noLoc t))) tvs
 +    | otherwise = foldl' (\x y -> noLoc (HsAppTy x y)) (noLoc (HsTyVar NotPromoted (noLoc t))) tvs
  
  -- | Keep export items with docs.
  pruneExportItems :: [ExportItem Name] -> [ExportItem Name]