SI-4360 Adds prefixes to scaladoc

This was a long-standing issue in scaladoc: It was unable to
disambiguate between entries with the same name. One example is:
immutable.Seq:

trait Seq[+A] extends Iterable[A] with Seq[A] ...

What's that? Seq extends Seq? No, immutable.Seq extends collection.Seq,
but scaladoc was unable to show that. Now it does, depending on the
template you're in. Prefixes are relative and can go back:
-scala.collection.Seq has subclasses *immutable.Seq* and *mutable.Seq*
-scala.immutable.Seq extends *collection.Seq*

Unfortunately the price we pay for this is high, a 20% slowdown in
scaladoc. This is why there is a new flag called -no-prefixes that
disables the prefixes in front of types.

Btw, it also fixes the notorious "booleanValue: This member is added by
an implicit conversion from Boolean to Boolean ...". That's now
java.lang.Boolean, so it becomes clear.

Conflicts:

	src/compiler/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala

1 files changed, 48 insertions, 0 deletions

diff --git a/test/scaladoc/run/SI-4360.scala b/test/scaladoc/run/SI-4360.scala
new file mode 100644
index 0000000000..3abc61c267
--- /dev/null
+++ b/test/scaladoc/run/SI-4360.scala
@@ -0,0 +1,48 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+
+  override def resourceFile = "SI-4360.scala"
+
+  // no need for special settings
+  def scaladocSettings = ""
+
+  def testModel(rootPackage: Package) = {
+    // get the quick access implicit defs in scope (_package(s), _class(es), _trait(s), object(s) _method(s), _value(s))
+    import access._
+
+    // just need to check the member exists, access methods will throw an error if there's a problem
+    val base = rootPackage._package("scala")._package("test")._package("scaladoc")._package("prefix")
+
+    val TEST = base._package("pack1")._package("c")._class("TEST")
+    val fooCA = TEST._method("fooCA")
+    val fooCB = TEST._method("fooCB")
+    val fooCS = TEST._method("fooCS")
+    val fooCL = TEST._method("fooCL")
+    val fooPA = TEST._method("fooPA")
+    val fooPB = TEST._method("fooPB")
+    val fooPC = TEST._method("fooPC")
+
+    val expected = List(
+      (fooCA, "Z", 1),
+      (fooCB, "B.Z", 1),
+      (fooCS, "pack2.Z.Z", 1),
+      (fooCL, "L.Z", 1),
+      (fooPA, "a.C", 1),
+      (fooPB, "b.C", 1),
+      (fooPC, "C", 1)
+    )
+
+    for ((method, name, refs) <- expected) {
+      assert(method.valueParams(0)(0).resultType.name == name,
+             method.valueParams(0)(0).resultType.name + " == " + name + " (in " + method.qualifiedName + ")")
+      assert(method.valueParams(0)(0).resultType.refEntity.size == refs,
+             method.valueParams(0)(0).resultType.refEntity.size + " == " + refs + " (in " + method.qualifiedName + ")")
+    }
+
+    val A = base._package("pack1")._package("c")._class("A")
+    assert(A.linearizationTypes(0).name == "pack1.A",   A.linearizationTypes(0).name + " == pack1.A")
+    assert(A.linearizationTypes(0).refEntity.size == 1, A.linearizationTypes(0).refEntity.size + " == 1")
+  }
+}
\ No newline at end of file