Merge pull request #13959 from dotty-staging/scaladoc/snippets-frame

Add missing styles to snippets that are not Scala

Author: BarkingBad

scaladoc-js/src/code-snippets/CodeSnippets.scala

@@ -20,7 +20,7 @@ class CodeSnippets:
     case _ => None
   }
 
-  def enrichSnippets() = document.querySelectorAll("div.snippet").foreach {
+  def enrichSnippets() = document.querySelectorAll("div.snippet[scala-snippet]").foreach {
     case snippet: html.Element =>
       snippet.addEventListener("click", (e: MouseEvent) => e.asInstanceOf[js.Dynamic].fromSnippet = true)
       snippetAnchor(snippet)

scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala

@@ -137,7 +137,7 @@ object SnippetRenderer:
   def renderSnippetWithMessages(snippetName: Option[String], codeLines: Seq[String], messages: Seq[SnippetCompilerMessage], hasContext: Boolean): String =
     val transformedLines = wrapCodeLines.andThen(addCompileMessages(messages)).apply(codeLines).map(_.toHTML)
     val codeHTML = s"""<code class="language-scala">${transformedLines.mkString("")}</code>"""
-    s"""<div class="snippet" ${if hasContext then "hasContext" else ""}><div class="buttons"></div><pre>$codeHTML</pre>${snippetName.fold("")(snippetLabel(_))}</div>"""
+    s"""<div class="snippet" scala-snippet ${if hasContext then "hasContext" else ""}><div class="buttons"></div><pre>$codeHTML</pre>${snippetName.fold("")(snippetLabel(_))}</div>"""
 
   def renderSnippetWithMessages(node: ExtendedFencedCodeBlock): String =
     renderSnippetWithMessages(

scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala

@@ -12,6 +12,7 @@ import com.vladsch.flexmark.util.ast._
 import com.vladsch.flexmark.util.options._
 import com.vladsch.flexmark.util.sequence.BasedSequence
 import com.vladsch.flexmark._
+import com.vladsch.flexmark.ast.FencedCodeBlock
 
 /**
  * SnippetRenderingExtension is responsible for running an analysis for scala codeblocks in the static documentation/scaladoc comments.
@@ -26,10 +27,17 @@ object SnippetRenderingExtension extends HtmlRenderer.HtmlRendererExtension:
         SnippetRenderer.renderSnippetWithMessages(node)
       )
 
+  object FencedCodeBlockHandler extends CustomNodeRenderer[FencedCodeBlock]:
+    override def render(node: FencedCodeBlock, c: NodeRendererContext, html: HtmlWriter): Unit =
+      html.raw("""<div class="snippet">""")
+      c.delegateRender()
+      html.raw("""</div>""")
+
   object Render extends NodeRenderer:
     override def getNodeRenderingHandlers: JSet[NodeRenderingHandler[_]] =
       JSet(
         new NodeRenderingHandler(classOf[ExtendedFencedCodeBlock], ExtendedFencedCodeBlockHandler),
+        new NodeRenderingHandler(classOf[FencedCodeBlock], FencedCodeBlockHandler)
       )
 
   object Factory extends NodeRendererFactory: