summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
diff options
context:
space:
mode:
authorDonna Malayeri <lindydonna@gmail.com>2011-04-08 15:10:32 +0000
committerDonna Malayeri <lindydonna@gmail.com>2011-04-08 15:10:32 +0000
commitb13ef720c09f1a7b6e3263faebcb0be7785a5337 (patch)
tree3dbd11d894f73fe09630ed8dfef4924257b9261b /src/compiler/scala/tools/nsc/doc/html/page/Template.scala
parent8cd754f3589c0b0b19b3869dba5e2ddfc54579d7 (diff)
downloadscala-b13ef720c09f1a7b6e3263faebcb0be7785a5337.tar.gz
scala-b13ef720c09f1a7b6e3263faebcb0be7785a5337.tar.bz2
scala-b13ef720c09f1a7b6e3263faebcb0be7785a5337.zip
[scaladoc] Don't generate long comments if they...
[scaladoc] Don't generate long comments if they are the same as the short comment. Closes #4455. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/doc/html/page/Template.scala')
-rw-r--r--src/compiler/scala/tools/nsc/doc/html/page/Template.scala13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
index f7d7b95844..cd733ced9a 100644
--- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
+++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
@@ -208,10 +208,15 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
if (commentBody.isEmpty)
NodeSeq.Empty
else {
- <xml:group>
- { memberToShortCommentHtml(mbr, isSelf) }
- <div class="fullcomment">{ memberToUseCaseCommentHtml(mbr, isSelf) }{ memberToCommentBodyHtml(mbr, isSelf) }</div>
- </xml:group>
+ val shortComment = memberToShortCommentHtml(mbr, isSelf)
+ val longComment = memberToUseCaseCommentHtml(mbr, isSelf) ++ memberToCommentBodyHtml(mbr, isSelf)
+
+ val includedLongComment = if (shortComment.text.trim == longComment.text.trim)
+ NodeSeq.Empty
+ else
+ <div class="fullcomment">{ longComment }</div>
+
+ shortComment ++ includedLongComment
}
}
}