From b8a8ac15567c40b5a01f0f3ba7b54202bff0b27d Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Tue, 21 Feb 2017 23:05:03 +0100 Subject: moved Pattern and TagsNotToClose to a HtmlTag companion object --- src/scaladoc/scala/tools/nsc/doc/base/comment/Body.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/scaladoc/scala/tools/nsc/doc/base/comment/Body.scala b/src/scaladoc/scala/tools/nsc/doc/base/comment/Body.scala index 407836f4a9..0560833618 100644 --- a/src/scaladoc/scala/tools/nsc/doc/base/comment/Body.scala +++ b/src/scaladoc/scala/tools/nsc/doc/base/comment/Body.scala @@ -73,9 +73,8 @@ object EntityLink { def unapply(el: EntityLink): Option[(Inline, LinkTo)] = Some((el.title, el.link)) } final case class HtmlTag(data: String) extends Inline { - private val Pattern = """(?ms)\A<(/?)(.*?)[\s>].*\z""".r private val (isEnd, tagName) = data match { - case Pattern(s1, s2) => + case HtmlTag.Pattern(s1, s2) => (! s1.isEmpty, Some(s2.toLowerCase)) case _ => (false, None) @@ -85,11 +84,14 @@ final case class HtmlTag(data: String) extends Inline { isEnd && tagName == open.tagName } - private val TagsNotToClose = Set("br", "img") def close = tagName collect { - case name if !TagsNotToClose(name) && !data.endsWith(s"") => HtmlTag(s"") + case name if !HtmlTag.TagsNotToClose(name) && !data.endsWith(s"") => HtmlTag(s"") } } +object HtmlTag { + private val Pattern = """(?ms)\A<(/?)(.*?)[\s>].*\z""".r + private val TagsNotToClose = Set("br", "img") +} /** The summary of a comment, usually its first sentence. There must be exactly one summary per body. */ final case class Summary(text: Inline) extends Inline -- cgit v1.2.3