Merge branch 'master' of https://github.com/scala/scala into wip-sip14-fixes

1 files changed, 70 insertions, 0 deletions

diff --git a/test/scaladoc/run/implicits-shadowing.scala b/test/scaladoc/run/implicits-shadowing.scala
new file mode 100644
index 0000000000..7835223d21
--- /dev/null
+++ b/test/scaladoc/run/implicits-shadowing.scala
@@ -0,0 +1,70 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+
+  // test a file instead of a piece of code
+  override def resourceFile = "implicits-shadowing-res.scala"
+
+  // start implicits
+  def scaladocSettings = "-implicits"
+
+  def testModel(root: Package) = {
+    // get the quick access implicit defs in scope (_package(s), _class(es), _trait(s), object(s) _method(s), _value(s))
+    import access._
+
+    // SEE THE test/resources/implicits-chaining-res.scala FOR THE EXPLANATION OF WHAT'S CHECKED HERE:
+    val base = root._package("scala")._package("test")._package("scaladoc")._package("implicits")._object("shadowing")
+    var conv: ImplicitConversion = null
+
+//// class A ///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    val A = base._class("A")
+
+    conv = A._conversion(base._object("A").qualifiedName + ".AtoZ")
+    assert(conv.members.length == 5)
+    conv._member("conv5")
+    conv._member("conv8")
+    conv._member("conv9")
+    conv._member("conv10")
+    conv._member("conv11")
+    assert(conv.constraints.length == 0)
+
+//// class B ///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    val B = base._class("B")
+
+    conv = B._conversion(base._object("A").qualifiedName + ".AtoZ")
+    assert(conv.members.length == 4)
+    conv._member("conv5")
+    conv._member("conv8")
+    conv._member("conv9")
+    conv._member("conv11")
+    assert(conv.constraints.length == 0)
+
+//// class C ///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    val C = base._class("C")
+
+    conv = C._conversion(base._object("A").qualifiedName + ".AtoZ")
+    assert(conv.members.length == 5)
+    conv._member("conv5")
+    conv._member("conv8")
+    conv._member("conv9")
+    conv._member("conv10")
+    conv._member("conv11")
+    assert(conv.constraints.length == 0)
+
+//// class D ///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    val D = base._class("D")
+
+    conv = D._conversion(base._object("A").qualifiedName + ".AtoZ")
+    assert(conv.members.length == 4)
+    conv._member("conv5")
+    conv._member("conv8")
+    conv._member("conv9")
+    conv._member("conv10")
+    assert(conv.constraints.length == 0)
+  }
+}
\ No newline at end of file