From 3fce9dfd7f786303582cbdbd6b7060f44d90471f Mon Sep 17 00:00:00 2001 From: Pedro Furlanetto Date: Wed, 20 Apr 2011 03:33:58 +0000 Subject: Shows deprecation message only once. --- src/compiler/scala/tools/nsc/doc/html/page/Template.scala | 14 ++++++++++++-- 1 file 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) {
Annotations
{ mbr.annotations.map { annot => - @{ templateToHtml(annot.annotationClass) }{ argumentsToHtml(annot.arguments) } + @{ templateToHtml(annot.annotationClass) }{ + if (showArguments(annot)) argumentsToHtml(annot.arguments) else NodeSeq.Empty + } } }
} else NodeSeq.Empty + } val sourceLink: Seq[scala.xml.Node] = mbr match { case dtpl: DocTemplateEntity if (isSelf && dtpl.sourceUrl.isDefined && dtpl.inSource.isDefined && !isReduced) => -- cgit v1.2.3