Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129

Conflicts:
	build.number
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/library/scala/collection/Iterator.scala
	versions.properties

4 files changed, 86 insertions, 0 deletions

diff --git a/test/scaladoc/run/t5730.check b/test/scaladoc/run/t5730.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/t5730.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/t5730.scala b/test/scaladoc/run/t5730.scala
new file mode 100644
index 0000000000..cc4c2444b1
--- /dev/null
+++ b/test/scaladoc/run/t5730.scala
@@ -0,0 +1,36 @@
+import scala.tools.nsc.doc.base._
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+
+  override def code = """
+      package scala.test.scaladoc.T5730
+
+      /**
+       *  A link:
+       *
+       * [[scala.Option$ object Option]].
+       */
+      sealed abstract class A
+
+      case object B extends A
+
+      abstract final class C
+      """
+
+  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._
+
+    val p = rootPackage._package("scala")._package("test")._package("scaladoc")._package("T5730")
+
+    val a = p._class("A")
+    val c = p._class("C")
+
+    assert(a.constructors.isEmpty, s"there should be no constructors, found: ${a.constructors}")
+    assert(c.constructors.isEmpty, s"there should be no constructors, found: ${c.constructors}")
+  }
+}
diff --git a/test/scaladoc/run/t6626.check b/test/scaladoc/run/t6626.check
new file mode 100644
index 0000000000..de3a6c5c0b
--- /dev/null
+++ b/test/scaladoc/run/t6626.check
@@ -0,0 +1,7 @@
+newSource:10: warning: Could not find any member to link for "SomeUnknownException".
+  /**
+  ^
+newSource:10: warning: Could not find any member to link for "IOException".
+  /**
+  ^
+Done.
diff --git a/test/scaladoc/run/t6626.scala b/test/scaladoc/run/t6626.scala
new file mode 100644
index 0000000000..6c61c605d6
--- /dev/null
+++ b/test/scaladoc/run/t6626.scala
@@ -0,0 +1,42 @@
+import scala.tools.nsc.doc.base._
+import scala.tools.nsc.doc.base.comment._
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+
+  override def code = """
+
+package org.foo
+
+class MyException extends Exception
+
+class MyOtherException extends Exception
+
+object Foo {
+  /**
+    * Test exception linking
+    *
+    * @throws org.foo.MyException linked with a fully-qualified name
+    * @throws MyOtherException linked with a relative name
+    * @throws SomeUnknownException not linked at all (but with some text)
+    * @throws IOException
+    */
+  def test(): Unit = ???
+}
+    """
+
+  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._
+
+    val a = rootPackage._package("org")._package("foo")._object("Foo")._method("test")
+    val throws = a.comment.get.throws
+    val allbodies = Body(throws.values.flatMap(_.blocks).toSeq)
+
+    val links = countLinksInBody(allbodies, _.link.isInstanceOf[LinkToTpl[_]])
+    assert(links == 2, links + " ==  2 (links to MyException and MyOtherException)")
+  }
+}