From 7fba64d2d04d1ccbbe8b93b70d9ad203f3a52ca0 Mon Sep 17 00:00:00 2001 From: Kato Kazuyoshi Date: Mon, 11 Apr 2011 13:52:29 +0000 Subject: [scaladoc] Closes #4452. Review by malayeri. --- src/compiler/scala/tools/nsc/ast/DocComments.scala | 6 +++++- test/scaladoc/scala/html/HtmlFactoryTest.scala | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/compiler/scala/tools/nsc/ast/DocComments.scala b/src/compiler/scala/tools/nsc/ast/DocComments.scala index 2e97a3d820..1a807cc2c3 100755 --- a/src/compiler/scala/tools/nsc/ast/DocComments.scala +++ b/src/compiler/scala/tools/nsc/ast/DocComments.scala @@ -304,7 +304,11 @@ trait DocComments { self: SymbolTable => val end = startTag(raw, (defines ::: usecases).sort(_._1 < _._1)) (if (end == raw.length - 2) raw else raw.substring(0, end) + "*/", - defines map { case (start, end) => raw.substring(start, end) }, + defines map { + case (start, end) => raw.substring(start, end) + } map { + _.replaceAll("(?m)^\\s+\\*", "") + }, usecases map { case (start, end) => decomposeUseCase(start, end) }) } diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala index c0a3f1ad95..4e5c0bcdee 100644 --- a/test/scaladoc/scala/html/HtmlFactoryTest.scala +++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala @@ -266,4 +266,12 @@ object Test extends Properties("HtmlFactory") { case _ => false } } + + property("Trac #4452") = { + createTemplate("Trac4452.scala") match { + case node: scala.xml.Node => + ! node.toString.contains("* blah blah blah") + case _ => false + } + } } -- cgit v1.2.3