Every tag element (even @define and @usecase) e...

Every tag element (even @define and @usecase) end before the next
recognised tag. Closes #4409. Review by extempore.

2 files changed, 23 insertions, 0 deletions

diff --git a/test/scaladoc/resources/Trac4409.scala b/test/scaladoc/resources/Trac4409.scala
new file mode 100644
index 0000000000..f93d3e238e
--- /dev/null
+++ b/test/scaladoc/resources/Trac4409.scala
@@ -0,0 +1,14 @@
+/**
+ * @define xxx
+ *
+ * The value of xxx don't contain since tag.
+ *
+ * @since 1.0
+ */
+
+class Trac4409 {
+  /**
+   * $xxx
+   */
+  def foo = 123
+}
diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala
index c0cd55a7e7..6b599693da 100644
--- a/test/scaladoc/scala/html/HtmlFactoryTest.scala
+++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala
@@ -257,4 +257,13 @@ object Test extends Properties("HtmlFactory") {
       case _ => false
     }
   }
+
+  property("Trac #4409") = {
+    createTemplate("Trac4409.scala") match {
+      case node: scala.xml.Node => {
+        ! node.toString.contains("""<div class="block"><ol>since""")
+      }
+      case _ => false
+    }
+  }
 }