From 86fe7de15988ea511fdc5e4f44039154cd236149 Mon Sep 17 00:00:00 2001
From: Antoine Gourlay <antoine@gourlay.fr>
Date: Mon, 2 May 2016 15:36:09 +0200
Subject: SI-9752 never ignore blank lines when parsing code blocks (#5125)

The default behavior when parsing the content of a tag text (like after
`@example`) was to ignore empty lines. That's fine, except when we are
in the middle of a code block, where preserving formatting matters.
---
 .../tools/nsc/doc/base/CommentFactoryBase.scala    |  2 +-
 test/scaladoc/run/t9752.check                      |  5 ++++
 test/scaladoc/run/t9752.scala                      | 28 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 test/scaladoc/run/t9752.check
 create mode 100644 test/scaladoc/run/t9752.scala

diff --git a/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala b/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala
index 8cd8a7ee09..d3b4bf8ff5 100644
--- a/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala
@@ -295,7 +295,7 @@ trait CommentFactoryBase { this: MemberLookupBase =>
       }
 
       case line :: ls if (lastTagKey.isDefined) => {
-        val newtags = if (!line.isEmpty) {
+        val newtags = if (!line.isEmpty || inCodeBlock) {
           val key = lastTagKey.get
           val value =
             ((tags get key): @unchecked) match {
diff --git a/test/scaladoc/run/t9752.check b/test/scaladoc/run/t9752.check
new file mode 100644
index 0000000000..daeafb8ecc
--- /dev/null
+++ b/test/scaladoc/run/t9752.check
@@ -0,0 +1,5 @@
+List(Body(List(Paragraph(Chain(List(Summary(Text())))), Code(class A
+
+
+class B))))
+Done.
diff --git a/test/scaladoc/run/t9752.scala b/test/scaladoc/run/t9752.scala
new file mode 100644
index 0000000000..b11c7f5c32
--- /dev/null
+++ b/test/scaladoc/run/t9752.scala
@@ -0,0 +1,28 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+
+  override def code = s"""
+  /**
+    * Foo
+    *
+    * @example
+    * {{{
+    * class A
+    *
+    *
+    * class B
+    * }}}
+    */
+    object Foo
+  """
+
+  def scaladocSettings = ""
+
+  def testModel(root: Package) = {
+    import access._
+    val obj = root._object("Foo")
+    println(obj.comment.get.example)
+  }
+}
-- 
cgit v1.2.3