summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Furlanetto <pedrofurla@gmail.com>2011-04-20 03:33:58 +0000
committerPedro Furlanetto <pedrofurla@gmail.com>2011-04-20 03:33:58 +0000
commit3fce9dfd7f786303582cbdbd6b7060f44d90471f (patch)
treee063e206282fa71ecec8ed32ccc231feb8d48304
parentfa8f997a2d0c3bef85c2b2aa6de59f8e1be29650 (diff)
downloadscala-3fce9dfd7f786303582cbdbd6b7060f44d90471f.tar.gz
scala-3fce9dfd7f786303582cbdbd6b7060f44d90471f.tar.bz2
scala-3fce9dfd7f786303582cbdbd6b7060f44d90471f.zip
Shows deprecation message only once.
-rw-r--r--src/compiler/scala/tools/nsc/doc/html/page/Template.scala14
1 files changed, 12 insertions, 2 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 03e36e6779..f3e197d0be 100644
--- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
+++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
@@ -320,18 +320,28 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
case _ => NodeSeq.Empty
}
- val annotations: Seq[scala.xml.Node] =
+ val annotations: Seq[scala.xml.Node] = {
+ // A list of annotations which don't show their arguments, e. g. because they are shown separately.
+ val annotationsWithHiddenArguments = List("deprecated", "Deprecated")
+
+ def showArguments(annotation: Annotation) = {
+ if (annotationsWithHiddenArguments.contains(annotation.qualifiedName)) false else true
+ }
+
if (!mbr.annotations.isEmpty) {
<dt>Annotations</dt>
<dd>{
mbr.annotations.map { annot =>
<xml:group>
- <span class="name">@{ templateToHtml(annot.annotationClass) }</span>{ argumentsToHtml(annot.arguments) }
+ <span class="name">@{ templateToHtml(annot.annotationClass) }</span>{
+ if (showArguments(annot)) argumentsToHtml(annot.arguments) else NodeSeq.Empty
+ }
</xml:group>
}
}
</dd>
} else NodeSeq.Empty
+ }
val sourceLink: Seq[scala.xml.Node] = mbr match {
case dtpl: DocTemplateEntity if (isSelf && dtpl.sourceUrl.isDefined && dtpl.inSource.isDefined && !isReduced) =>