2 files changed, 14 insertions, 10 deletions
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 2a07547de2..ac5fec80b3 100755
--- a/src/scaladoc/scala/tools/nsc/doc/base/comment/Body.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/base/comment/Body.scala
@@ -73,16 +73,20 @@ object EntityLink {
   def unapply(el: EntityLink): Option[(Inline, LinkTo)] = Some((el.title, el.link))
 }
 final case class HtmlTag(data: String) extends Inline {
-  def canClose(open: HtmlTag) = {
-    open.data.stripPrefix("<") == data.stripPrefix("</")
+  private val Pattern = """(?ms)\A<(/?)(.*?)[\s>].*\z""".r
+  private val (isEnd, tagName) = data match {
+    case Pattern(s1, s2) =>
+      (! s1.isEmpty, Some(s2.toLowerCase))
+    case _ =>
+      (false, None)
   }
 
-  def close = {
-    if (data.indexOf("</") == -1)
-      Some(HtmlTag("</" + data.stripPrefix("<")))
-    else
-      None
+  def canClose(open: HtmlTag) = {
+    isEnd && tagName == open.tagName
   }
+
+  private val TagsNotToClose = Set("br", "img")
+  def close = tagName collect { case name if !TagsNotToClose(name) => HtmlTag(s"</$name>") }
 }
 
 /** The summary of a comment, usually its first sentence. There must be exactly one summary per body. */
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/SyntaxHigh.scala b/src/scaladoc/scala/tools/nsc/doc/html/SyntaxHigh.scala
index 5781e680dd..348ea97c5b 100644
--- a/src/scaladoc/scala/tools/nsc/doc/html/SyntaxHigh.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/html/SyntaxHigh.scala
@@ -6,6 +6,7 @@
 package scala.tools.nsc.doc.html
 
 import scala.xml.NodeSeq
+import scala.annotation.tailrec
 
 /** Highlight the syntax of Scala code appearing in a `{{{` wiki block
   * (see method `HtmlPage.blockToHtml`).
@@ -209,9 +210,9 @@ private[html] object SyntaxHigh {
       out.toString
     }
 
-    def parse(pre: String, i: Int): Int = {
+    @tailrec def parse(pre: String, i: Int): Unit = {
       out append pre
-      if (i == buf.length) return i
+      if (i == buf.length) return
       buf(i) match {
         case '\n' =>
           parse("\n", i+1)
@@ -277,7 +278,6 @@ private[html] object SyntaxHigh {
           } else
             parse(buf(i).toChar.toString, i+1)
       }
-      i
     }
 
     parse("", 0)