From 82f5ef8484fb91230a83d26c971a7082547e32b8 Mon Sep 17 00:00:00 2001
From: RyanGlScott <ryan.gl.scott@gmail.com>
Date: Thu, 11 Feb 2016 20:17:09 -0500
Subject: [PATCH] Ensure expanded family instances render correctly
(cherry picked from commit 1338b5d7c32939de6bbc31af0049477e4f847103)
---
haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 5 +++--
haddock-api/src/Haddock/Backends/Xhtml/Layout.hs | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index 660a8475ea..fab6bf8d40 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@ -616,14 +616,15 @@ ppInstHead links splice unicode qual mdoc origin orphan no ihd@(InstHead {..}) =
)
where
ptype = keyword "type" <+> typ
- prhs = maybe noHtml (\t -> equals <+> ppType unicode qual t) rhs
+ prhs = ptype <+> maybe noHtml
+ (\t -> equals <+> ppType unicode qual t) rhs
DataInst dd ->
( subInstHead iid pdata
, mdoc
, [subFamInstDetails iid pdecl])
where
pdata = keyword "data" <+> typ
- pdecl = ppShortDataDecl False True dd unicode qual
+ pdecl = pdata <+> ppShortDataDecl False True dd unicode qual
where
iid = instanceId origin no orphan ihd
typ = ppAppNameTypes ihdClsName ihdKinds ihdTypes unicode qual
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs b/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs
index 19de935cdb..41457f72c5 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs
@@ -232,7 +232,7 @@ subFamInstDetails :: String -- ^ Instance unique id (for anchor generation)
-> Html -- ^ Type or data family instance
-> Html
subFamInstDetails iid fi =
- subInstSection iid << declElem fi
+ subInstSection iid << thediv ! [theclass "src"] << fi
subInstSection :: String -- ^ Instance unique id (for anchor generation)
-> Html
--
GitLab