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.

3 files changed, 70 insertions, 31 deletions

diff --git a/test/scaladoc/resources/SI-3314.scala b/test/scaladoc/resources/SI-3314.scala
new file mode 100644
index 0000000000..e5773a4970
--- /dev/null
+++ b/test/scaladoc/resources/SI-3314.scala
@@ -0,0 +1,70 @@
+package scala.test.scaladoc {
+
+  package test1 {
+    class Enum {
+      abstract class Value
+      class Val extends Value
+      def Value(): Value = new Val
+    }
+
+    object Constants extends Enum {
+      def a = Value
+    }
+  }
+
+  package test2 {
+    trait WeekDayTrait extends Enumeration {
+      type WeekDay = Value
+      val Mon, Tue, Wed, Thu, Fri, Sat, Sun = Value
+    }
+
+    class WeekDayClass extends Enumeration {
+      type WeekDay = Value
+      val Mon, Tue, Wed, Thu, Fri, Sat, Sun = Value
+    }
+
+    object WeekDayObject extends Enumeration {
+      type WeekDay = Value
+      val Mon, Tue, Wed, Thu, Fri, Sat, Sun = Value
+    }
+
+    object UserObject {
+      def isWorkingDay1(d: scala.test.scaladoc.test2.WeekDayClass#Value) = false
+      def isWorkingDay2(d: scala.test.scaladoc.test2.WeekDayClass#WeekDay) = false
+      def isWorkingDay3(d: scala.test.scaladoc.test2.WeekDayTrait#Value) = false
+      def isWorkingDay4(d: scala.test.scaladoc.test2.WeekDayTrait#WeekDay) = false
+      def isWorkingDay5(d: scala.test.scaladoc.test2.WeekDayObject.Value) = false
+      def isWorkingDay6(d: scala.test.scaladoc.test2.WeekDayObject.WeekDay) = false
+      import WeekDayObject._
+      def isWorkingDay7(d: Value) = ! (d == Sat || d == Sun)
+      def isWorkingDay8(d: WeekDay) = ! (d == Sat || d == Sun)
+      def isWorkingDay9(d: WeekDayObject.Value) = ! (d == Sat || d == Sun)
+    }
+
+    class UserClass {
+      def isWorkingDay1(d: scala.test.scaladoc.test2.WeekDayClass#Value) = false
+      def isWorkingDay2(d: scala.test.scaladoc.test2.WeekDayClass#WeekDay) = false
+      def isWorkingDay3(d: scala.test.scaladoc.test2.WeekDayTrait#Value) = false
+      def isWorkingDay4(d: scala.test.scaladoc.test2.WeekDayTrait#WeekDay) = false
+      def isWorkingDay5(d: scala.test.scaladoc.test2.WeekDayObject.Value) = false
+      def isWorkingDay6(d: scala.test.scaladoc.test2.WeekDayObject.WeekDay) = false
+      import WeekDayObject._
+      def isWorkingDay7(d: Value) = ! (d == Sat || d == Sun)
+      def isWorkingDay8(d: WeekDay) = ! (d == Sat || d == Sun)
+      def isWorkingDay9(d: WeekDayObject.Value) = ! (d == Sat || d == Sun)
+    }
+
+    trait UserTrait {
+      def isWorkingDay1(d: scala.test.scaladoc.test2.WeekDayClass#Value) = false
+      def isWorkingDay2(d: scala.test.scaladoc.test2.WeekDayClass#WeekDay) = false
+      def isWorkingDay3(d: scala.test.scaladoc.test2.WeekDayTrait#Value) = false
+      def isWorkingDay4(d: scala.test.scaladoc.test2.WeekDayTrait#WeekDay) = false
+      def isWorkingDay5(d: scala.test.scaladoc.test2.WeekDayObject.Value) = false
+      def isWorkingDay6(d: scala.test.scaladoc.test2.WeekDayObject.WeekDay) = false
+      import WeekDayObject._
+      def isWorkingDay7(d: Value) = ! (d == Sat || d == Sun)
+      def isWorkingDay8(d: WeekDay) = ! (d == Sat || d == Sun)
+      def isWorkingDay9(d: WeekDayObject.Value) = ! (d == Sat || d == Sun)
+    }
+  }
+}
diff --git a/test/scaladoc/resources/SI_4676.scala b/test/scaladoc/resources/SI_4676.scala
deleted file mode 100644
index 00c0fc7ea9..0000000000
--- a/test/scaladoc/resources/SI_4676.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-class SI_4676 {
-  type SS = (String,String)
-  def x(ss: SS): Int = 3
-}
diff --git a/test/scaladoc/resources/Trac3484.scala b/test/scaladoc/resources/Trac3484.scala
deleted file mode 100644
index 9656ec268d..0000000000
--- a/test/scaladoc/resources/Trac3484.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-class cbf[A, B, C]
-
-/**
- *  @define Coll Traversable
- *  @define bfreturn $Coll
- */
-class Collection[A] {
-  /** What map does...
-   *
-   *  $bfreturn
-   *  @usecase def map[B](f: A => B): $bfreturn[B]
-   *
-   */
-  def map[B, That](f: A => B)(implicit fact: cbf[Collection[A], B, That]) =
-    null
-}
-
-/**
- *  @define b John
- *  @define a Mister $b
- */
-class SR704 {
-  /**
-   *  Hello $a.
-   */
-  def foo = 123
-}