summaryrefslogtreecommitdiff
path: root/test/scaladoc/resources/links.scala
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-10-11 10:49:03 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-10-11 10:49:03 -0700
commit553ee0118dbc052bed8c4580376b48cd9cb5d0f9 (patch)
tree4926c23ca47a334a5bba5863d90102ced446389c /test/scaladoc/resources/links.scala
parent90c7596c0736d56ff7b8d699bd958d28cb213bdf (diff)
parent2edf78f3a05112961ed6ad56452e9b5dc150fc3c (diff)
downloadscala-553ee0118dbc052bed8c4580376b48cd9cb5d0f9.tar.gz
scala-553ee0118dbc052bed8c4580376b48cd9cb5d0f9.tar.bz2
scala-553ee0118dbc052bed8c4580376b48cd9cb5d0f9.zip
Merge pull request #1491 from VladUreche/topic/scaladoc2
Scaladoc bugfixes for reflection
Diffstat (limited to 'test/scaladoc/resources/links.scala')
-rw-r--r--test/scaladoc/resources/links.scala14
1 files changed, 13 insertions, 1 deletions
diff --git a/test/scaladoc/resources/links.scala b/test/scaladoc/resources/links.scala
index 09a52a4334..bd69665357 100644
--- a/test/scaladoc/resources/links.scala
+++ b/test/scaladoc/resources/links.scala
@@ -3,6 +3,9 @@
// SI-4497 "Links in ScalaDoc - Spec and implementation unsufficient"
// SI-4224 "Wiki-links should support method targets"
// SI-3695 "support non-fully-qualified type links in scaladoc comments"
+// SI-6487 "Scaladoc can't link to inner classes"
+// SI-6495 "Scaladoc won't pick up group name, priority and description from owner chain"
+// SI-6501 "Scaladoc won't link to a @template type T as a template but as a member"
package scala.test.scaladoc.links {
import language.higherKinds
class C
@@ -54,9 +57,18 @@ package scala.test.scaladoc.links {
* - [[localMethod object TEST -> localMethod]] (should use the current template to resolve link instead of inTpl, that's the package)
* - [[#localMethod object TEST -> localMethod]] (should exercise Java-style links to empty members)
* - [[ImOutside class ImOutside (check correct lookup in EmptyPackage)]]
+ * - [[ImOutside.Inner#foo class ImOutside#class Inner#method foo (check correct lookup in EmptyPackage)]]
+ * - [[ImOutside.T class ImOutside#type T (check correct linking to templates)]]
+ * - [[ImOutside.T#foo class ImOutside#type T#method foo (check correct interaction between @template and links)]]
*/
object TEST {
def localMethod = 3
}
}
-class ImOutside \ No newline at end of file
+trait ImOutside {
+ /** @template */
+ type T <: Inner
+ class Inner {
+ def foo: Any
+ }
+}