Merge pull request #1099 from mkurz/allow_subtypes

Also handle sub classes of `T <: Appendable[T]` as raw

Author: mkurz

api/shared/src/main/scala-2.12/play/twirl/api/BaseScalaTemplate.scala

@@ -21,7 +21,7 @@ case class BaseScalaTemplate[T <: Appendable[T], F <: Format[T]]($twirl__format:
 
   def _display_(o: Any)(implicit m: ClassTag[T]): T = {
     o match {
-      case escaped if escaped != null && escaped.getClass == m.runtimeClass => escaped.asInstanceOf[T]
+      case escaped if escaped != null && m.runtimeClass.isInstance(escaped) => escaped.asInstanceOf[T]
       case ()                                                               => $twirl__format.empty
       case None                                                             => $twirl__format.empty
       case Some(v)                                                          => _display_(v)

api/shared/src/main/scala-2.13/play/twirl/api/BaseScalaTemplate.scala

@@ -21,7 +21,7 @@ case class BaseScalaTemplate[T <: Appendable[T], F <: Format[T]]($twirl__format:
 
   def _display_(o: Any)(implicit m: ClassTag[T]): T = {
     o match {
-      case escaped if escaped != null && escaped.getClass == m.runtimeClass => escaped.asInstanceOf[T]
+      case escaped if escaped != null && m.runtimeClass.isInstance(escaped) => escaped.asInstanceOf[T]
       case ()                                                               => $twirl__format.empty
       case None                                                             => $twirl__format.empty
       case Some(v)                                                          => _display_(v)

api/shared/src/main/scala-3/play/twirl/api/BaseScalaTemplate.scala

@@ -21,7 +21,7 @@ case class BaseScalaTemplate[T <: Appendable[T], F <: Format[T]]($twirl__format:
 
   def _display_(o: Any)(implicit m: ClassTag[T]): T = {
     o match {
-      case escaped if escaped != null && escaped.getClass == m.runtimeClass => escaped.asInstanceOf[T]
+      case escaped if escaped != null && m.runtimeClass.isInstance(escaped) => escaped.asInstanceOf[T]
       case ()                                                               => $twirl__format.empty
       case None                                                             => $twirl__format.empty
       case Some(v)                                                          => _display_(v)

compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala

@@ -1009,6 +1009,18 @@ class CompilerSpec extends AnyWordSpec with Matchers with BeforeAndAfterEach {
       compiled.static("markdown").toString.trim must be("markdown")
     }
 
+    "compile successfully (don't escape) when using sub class of Html (which is a subclass of Appendable)" in {
+      TwirlIO.writeStringToFile(
+        tmpTemplateFile,
+        """@{(new play.twirl.api.Html("<foo>")): play.twirl.api.HtmlFormat.Appendable}
+          |@{(new play.twirl.api.Html("<foo>") {}): play.twirl.api.HtmlFormat.Appendable}
+          |""".stripMargin
+      )
+      val helper   = newCompilerHelper
+      val compiled = helper.compile[(() => Html)]("temporary.scala.html", "html.temporary")
+      compiled.static().toString.trim.replaceAll(" ", "").replaceAll("\n", "") must be("<foo><foo>")
+    }
+
     "fail val shadowing var and reassigning val in if" when {
 
       "using pure code blocks" in {