diff options
author | Ben Gamari <ben@smart-cactus.org> | 2016-04-16 17:50:23 +0200 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2016-04-16 17:50:23 +0200 |
commit | 1204af7031c627b39d4cef7cdb5842cdc199ddde (patch) | |
tree | 42bca842e4b2cb2391776bb7d128ccf89d872c7e /haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | |
parent | c6d6a18d85e5e2d9bb5904e6919e8a8d7e31c4c5 (diff) | |
parent | 1338b5d7c32939de6bbc31af0049477e4f847103 (diff) |
Merge pull request #482 from RyanGlScott/ghc-head
Collapse type/data family instances by default
Diffstat (limited to 'haddock-api/src/Haddock/Backends/Xhtml/Decl.hs')
-rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs index b354658d..fab6bf8d 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs @@ -607,20 +607,26 @@ ppInstHead links splice unicode qual mdoc origin orphan no ihd@(InstHead {..}) = , [subInstDetails iid ats sigs] ) where - iid = instanceId origin no orphan ihd sigs = ppInstanceSigs links splice unicode qual clsiSigs ats = ppInstanceAssocTys links splice unicode qual clsiAssocTys TypeInst rhs -> - (ptype, mdoc, []) + ( subInstHead iid ptype + , mdoc + , [subFamInstDetails iid prhs] + ) where - ptype = keyword "type" <+> typ <+> prhs - prhs = maybe noHtml (\t -> equals <+> ppType unicode qual t) rhs + ptype = keyword "type" <+> typ + prhs = ptype <+> maybe noHtml + (\t -> equals <+> ppType unicode qual t) rhs DataInst dd -> - (pdata, mdoc, []) + ( subInstHead iid pdata + , mdoc + , [subFamInstDetails iid pdecl]) where - pdata = keyword "data" <+> typ <+> pdecl - pdecl = ppShortDataDecl False True dd unicode qual + pdata = keyword "data" <+> typ + pdecl = pdata <+> ppShortDataDecl False True dd unicode qual where + iid = instanceId origin no orphan ihd typ = ppAppNameTypes ihdClsName ihdKinds ihdTypes unicode qual |