diff options
author | Donna Malayeri <lindydonna@gmail.com> | 2011-04-07 13:34:14 +0000 |
---|---|---|
committer | Donna Malayeri <lindydonna@gmail.com> | 2011-04-07 13:34:14 +0000 |
commit | da67f3b71efbcaa1c97f7b85269a50ce8d5b4499 (patch) | |
tree | 246e03646073e8cf1fda63c91178d32282b82c2b | |
parent | 8088ca13c43d10b7434c92ab8238b163f54fb0e2 (diff) | |
download | scala-da67f3b71efbcaa1c97f7b85269a50ce8d5b4499.tar.gz scala-da67f3b71efbcaa1c97f7b85269a50ce8d5b4499.tar.bz2 scala-da67f3b71efbcaa1c97f7b85269a50ce8d5b4499.zip |
[scaladoc] Make links to classes and traits not...
[scaladoc] Make links to classes and traits not be the entire line, but
just the template name. Closes #4444. No review.
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/page/Template.scala | 11 |
1 files changed, 8 insertions, 3 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 bc35e4835a..d8c51b97fc 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala @@ -468,11 +468,16 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { /** name, tparams, params, result */ def signature(mbr: MemberEntity, isSelf: Boolean, isReduced: Boolean = false): NodeSeq = { - def inside(hasLinks: Boolean): NodeSeq = + def inside(hasLinks: Boolean, nameLink: String = ""): NodeSeq = <xml:group> <span class="kind">{ kindToString(mbr) }</span> <span class="symbol"> - <span class={"name" + (if (mbr.deprecation.isDefined) " deprecated" else "") }>{ if (mbr.isConstructor) tpl.name else mbr.name }</span> + { + val nameHtml = <span class={"name" + (if (mbr.deprecation.isDefined) " deprecated" else "") }>{ if (mbr.isConstructor) tpl.name else mbr.name }</span> + if (!nameLink.isEmpty) + <a href={nameLink}>{nameHtml}</a> + else nameHtml + } { def tparamsToHtml(mbr: Entity): NodeSeq = mbr match { case hk: HigherKinded => @@ -544,7 +549,7 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { </xml:group> mbr match { case dte: DocTemplateEntity if !isSelf => - <h4 class="signature"><a href={ relativeLinkTo(dte) }>{ inside(hasLinks = false) }</a></h4> + <h4 class="signature">{ inside(hasLinks = false, nameLink = relativeLinkTo(dte)) }</h4> case _ if isSelf => <h4 id="signature" class="signature">{ inside(hasLinks = true) }</h4> case _ => |