3 files changed, 61 insertions, 1 deletions

diff --git a/test/scaladoc/resources/SI-6509.scala b/test/scaladoc/resources/SI-6509.scala
new file mode 100644
index 0000000000..540ba243bd
--- /dev/null
+++ b/test/scaladoc/resources/SI-6509.scala
@@ -0,0 +1,24 @@
+package test.scaladoc.template.owners
+
+trait X {
+  /** @template */
+  type Symbol >: Null <: SymbolApi
+
+  /** @template */
+  type TypeSymbol >: Null <: Symbol with TypeSymbolApi
+
+  /** @template */
+  type TermSymbol >: Null <: Symbol with TermSymbolApi
+
+  /** @template */
+  type MethodSymbol >: Null <: TermSymbol with MethodSymbolApi
+
+  trait SymbolApi { this: Symbol => def x: Int}
+  trait TermSymbolApi extends SymbolApi { this: TermSymbol => def y: Int}
+  trait TypeSymbolApi extends SymbolApi { this: TypeSymbol => def z: Int}
+  trait MethodSymbolApi extends TermSymbolApi { this: MethodSymbol => def t: Int }
+}
+
+trait Y extends X
+trait Z extends Y
+trait T extends Z
diff --git a/test/scaladoc/resources/SI-6511.scala b/test/scaladoc/resources/SI-6511.scala
new file mode 100644
index 0000000000..1f153caeb0
--- /dev/null
+++ b/test/scaladoc/resources/SI-6511.scala
@@ -0,0 +1,24 @@
+package test.scaladoc.template.diagrams
+
+/** @contentDiagram hideNodes "*Api" */
+trait X {
+  /** @template */
+  type Symbol >: Null <: SymbolApi
+
+  /** @template */
+  type TypeSymbol >: Null <: Symbol with TypeSymbolApi
+
+  /** @template */
+  type TermSymbol >: Null <: Symbol with TermSymbolApi
+
+  /** @template */
+  type MethodSymbol >: Null <: TermSymbol with MethodSymbolApi
+
+  trait SymbolApi { this: Symbol => def x: Int}
+  trait TermSymbolApi extends SymbolApi { this: TermSymbol => def y: Int}
+  trait TypeSymbolApi extends SymbolApi { this: TypeSymbol => def z: Int}
+  trait MethodSymbolApi extends TermSymbolApi { this: MethodSymbol => def t: Int }
+}
+
+/** @contentDiagram hideNodes "*Api" */
+trait Y extends X
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
+  }
+}