Merge commit 'abd595d' into merge/2.11.x-to-2.12.x-20140915

4 files changed, 47 insertions, 3 deletions

diff --git a/test/scaladoc/resources/code-indent.scala b/test/scaladoc/resources/code-indent.scala
index 88946ffc7f..2eee3352b4 100644
--- a/test/scaladoc/resources/code-indent.scala
+++ b/test/scaladoc/resources/code-indent.scala
@@ -20,6 +20,12 @@
  *       an alternative
  *         the e l s e branch
  *    }}}
+ *    {{{
+ *    Trait example {
+ *      Val x = a
+ *      Val y = b
+ *    }
+ *    }}}
  *    NB: Trailing spaces are necessary for this test!
  *    {{{
  *       l1
diff --git a/test/scaladoc/run/t8113.check b/test/scaladoc/run/t8113.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/t8113.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/t8113.scala b/test/scaladoc/run/t8113.scala
new file mode 100644
index 0000000000..f006213ef2
--- /dev/null
+++ b/test/scaladoc/run/t8113.scala
@@ -0,0 +1,36 @@
+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 = """
+  /**
+   *  Check out [[http://www.scala-lang.org
+   *  this great website]]!
+   */
+  class Test
+  """
+
+  def scaladocSettings = ""
+
+  def testModel(rootPackage: Package) = {
+    import access._
+
+    val test = rootPackage._class("Test")
+
+    // find Link
+    def find(body: Any): Option[Link] = body match {
+        case l: Link => Some(l)
+        case s: Seq[_]  => s.toList.map(find(_)).flatten.headOption
+        case p: Product => p.productIterator.toList.map(find(_)).flatten.headOption
+        case _          => None
+      }
+
+    val link = find(test.comment.get.body).collect { case Link(ta, Text(ti)) => (ta, ti) }
+    assert(link.isDefined)
+    val expected = ("http://www.scala-lang.org", "this great website")
+    link.foreach {l => assert(l == expected, s"$l != $expected")}
+  }
+}
diff --git a/test/scaladoc/scalacheck/HtmlFactoryTest.scala b/test/scaladoc/scalacheck/HtmlFactoryTest.scala
index fdc4f9527f..fc190b188c 100644
--- a/test/scaladoc/scalacheck/HtmlFactoryTest.scala
+++ b/test/scaladoc/scalacheck/HtmlFactoryTest.scala
@@ -659,6 +659,7 @@ object Test extends Properties("HtmlFactory") {
         s.contains("<pre>two lines, one useful</pre>") &&
         s.contains("<pre>line1\nline2\nline3\nline4</pre>") &&
         s.contains("<pre>a ragged example\na (condition)\n  the t h e n branch\nan alternative\n  the e l s e branch</pre>") &&
+        s.contains("<pre>Trait example {\n  Val x = a\n  Val y = b\n}</pre>") &&
         s.contains("<pre>l1\n\nl2\n\nl3\n\nl4\n\nl5</pre>")
       }
       case _ => false
@@ -683,7 +684,7 @@ object Test extends Properties("HtmlFactory") {
     oneAuthor match {
       case node: scala.xml.Node => {
         val s = node.toString
-        s.contains("<h6>Author:</h6>")
+        s.contains("<h6>Author:</h6>") &&
         s.contains("<p>The Only Author\n</p>")
       }
       case _ => false
@@ -696,8 +697,8 @@ object Test extends Properties("HtmlFactory") {
     twoAuthors match {
       case node: scala.xml.Node => {
         val s = node.toString
-        s.contains("<h6>Authors:</h6>")
-        s.contains("<p>The First Author\n</p>")
+        s.contains("<h6>Authors:</h6>") &&
+        s.contains("<p>The First Author</p>") &&
         s.contains("<p>The Second Author\n</p>")
       }
       case _ => false