aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Haddock/Backends/Html.hs15
-rw-r--r--src/Haddock/GHC/Utils.hs2
2 files changed, 16 insertions, 1 deletions
diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs
index a958cb75..d3e4478c 100644
--- a/src/Haddock/Backends/Html.hs
+++ b/src/Haddock/Backends/Html.hs
@@ -864,6 +864,11 @@ ppAsst n ts = ppDocName n <+> hsep (map ppParendType ts)
orig (L _ (NoLink name)) = name
orig _ = error "orig"
+
+lDocLinkName (L _ (NoLink name)) = name
+lDocLinkName (L _ (Link name)) = name
+
+
-- TODO: print contexts
ppShortDataDecl :: Bool -> LinksInfo -> SrcSpan ->
Maybe (HsDoc DocName) -> TyClDecl DocName -> Html
@@ -1236,7 +1241,10 @@ ppr_mono_ty ctxt_prec (HsAppTy fun_ty arg_ty)
ppr_mono_ty ctxt_prec (HsOpTy ty1 op ty2)
= maybeParen ctxt_prec pREC_OP $
- ppr_mono_lty pREC_OP ty1 <+> ppLDocName op <+> ppr_mono_lty pREC_OP ty2
+ ppr_mono_lty pREC_OP ty1 <+> ppr_op <+> ppr_mono_lty pREC_OP ty2
+ where
+ ppr_op = if not (isNameSymOcc name) then quote (ppLDocName op) else ppLDocName op
+ name = lDocLinkName op
ppr_mono_ty ctxt_prec (HsParTy ty)
= parens (ppr_mono_lty pREC_TOP ty)
@@ -1371,6 +1379,11 @@ char c = toHtml [c]
empty :: Html
empty = noHtml
+
+quote :: Html -> Html
+quote h = char '`' +++ h +++ '`'
+
+
parens, brackets, braces :: Html -> Html
parens h = char '(' +++ h +++ char ')'
brackets h = char '[' +++ h +++ char ']'
diff --git a/src/Haddock/GHC/Utils.hs b/src/Haddock/GHC/Utils.hs
index 8e70057f..26860116 100644
--- a/src/Haddock/GHC/Utils.hs
+++ b/src/Haddock/GHC/Utils.hs
@@ -52,6 +52,8 @@ modulePkgStr = packageIdString . modulePackageId
-- misc
+isNameSymOcc = isSymOcc . nameOccName
+
-- there should be a better way to check this using the GHC API
isConSym n = head (nameOccString n) == ':'