Adds support for @note in ScalaDoc.

1 files changed, 10 insertions, 1 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 b701e0e2ad..40e0ca930a 100644
--- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
+++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
@@ -407,6 +407,15 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
             <dd>{ for(body <- comment.since.toList) yield {bodyToHtml(body)} }</dd>
           } else NodeSeq.Empty
 
+        val note: Seq[scala.xml.Node] =
+          if(!comment.note.isEmpty && !isReduced) {
+            <dt>Note</dt>
+            <dd>{
+              val noteXml: List[scala.xml.NodeSeq] = (for(note <- comment.note ) yield <span class="cmt">{bodyToHtml(note)}</span> )
+              noteXml.reduceLeft(_ ++ Text(", ") ++ _)
+            }</dd>
+          } else NodeSeq.Empty
+
         val seeAlso: Seq[scala.xml.Node] =
           if(!comment.see.isEmpty && !isReduced) {
             <dt>See also</dt>
@@ -416,7 +425,7 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
             }</dd>
           } else NodeSeq.Empty
 
-        example ++ version ++ sinceVersion ++ seeAlso
+        example ++ version ++ sinceVersion ++ note ++ seeAlso
 
       case None => NodeSeq.Empty
     }