diff options
author | Vlad Ureche <vlad.ureche@gmail.com> | 2012-06-16 04:23:43 +0200 |
---|---|---|
committer | Vlad Ureche <vlad.ureche@gmail.com> | 2012-07-16 23:41:43 +0200 |
commit | f916434c119289773e5aad88c633c30f68a12e14 (patch) | |
tree | 12f8c6a52d480454d4cefb0d7a10975b39c3d3c5 /src/compiler/scala/tools/nsc/doc/html/page/IndexScript.scala | |
parent | fcbdc1725c6fcd65a071709408ef75097f487cb7 (diff) | |
download | scala-f916434c119289773e5aad88c633c30f68a12e14.tar.gz scala-f916434c119289773e5aad88c633c30f68a12e14.tar.bz2 scala-f916434c119289773e5aad88c633c30f68a12e14.zip |
SI-3314 SI-4888 Scaladoc: Relative type prefixes
And adds support for linking to class members, only usable from the
model factory now, so no links to members from the doc comment yet,
sorry. But it fixes the Enumeration problem once and for all!
Also corrected the inTpl for members obtained by implicit conversions,
so they're in the correct template and the comment variable expansion
is done from the correct (but different) template.
Review by @kzys.
Diffstat (limited to 'src/compiler/scala/tools/nsc/doc/html/page/IndexScript.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/page/IndexScript.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/page/IndexScript.scala b/src/compiler/scala/tools/nsc/doc/html/page/IndexScript.scala index 2b68ac2937..e1ab479f9d 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/IndexScript.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/IndexScript.scala @@ -62,7 +62,9 @@ class IndexScript(universe: doc.Universe, index: doc.Index) extends Page { def allPackagesWithTemplates = { Map(allPackages.map((key) => { - key -> key.templates.filter(t => !t.isPackage && !universe.settings.hardcoded.isExcluded(t.qualifiedName)) + key -> key.templates.collect { + case t: DocTemplateEntity if !t.isPackage && !universe.settings.hardcoded.isExcluded(t.qualifiedName) => t + } }) : _*) } } |