deps(scaladoc): update flexmark from 0.42.12 to 0.64.0

This pr updates the flexmark dependencies used in Scaladoc from 0.42.12,
which is from 2019, up to the latest release of 0.64.0. This is mainly
done to tackle a bunch of CVEs that are attatched to the old versions of
flexmark.

Author: ckipp01

project/Dependencies.scala

@@ -10,16 +10,15 @@ object Dependencies {
   val `jackson-dataformat-yaml` =
     "com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonVersion
 
-  private val flexmarkVersion = "0.42.12"
+  private val flexmarkVersion = "0.64.0"
 
   val flexmarkDeps = Seq(
     "com.vladsch.flexmark" % "flexmark" % flexmarkVersion,
-    "com.vladsch.flexmark" % "flexmark-html-parser" % flexmarkVersion,
+    "com.vladsch.flexmark" % "flexmark-util-html" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-anchorlink" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
-    "com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-wikilink" % flexmarkVersion,
     "com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,

scaladoc/src/dotty/tools/scaladoc/parsers/WikiCodeBlockParser.scala

@@ -6,13 +6,14 @@ import com.vladsch.flexmark.parser.core._
 import com.vladsch.flexmark.parser.block._
 import com.vladsch.flexmark.util.ast.Block
 import com.vladsch.flexmark.util.ast.BlockContent
-import com.vladsch.flexmark.util.options.DataHolder
+import com.vladsch.flexmark.util.data.DataHolder
 import com.vladsch.flexmark.util.sequence.BasedSequence
 import com.vladsch.flexmark.util.sequence.SegmentedSequence
 
 import java.{util => ju}
 import ju.regex.Matcher
 import ju.regex.Pattern
+import scala.jdk.CollectionConverters._
 
 
 /** Copied from FencedCodeBlockParser. */
@@ -21,8 +22,11 @@ object WikiCodeBlockParser {
   private val CLOSING_FENCE = Pattern.compile("^(\\}{3})(?=[ \t]*$)$")
 
   class Factory extends CustomBlockParserFactory {
+    override def apply(options: DataHolder): BlockParserFactory =
+      new WikiCodeBlockParser.BlockFactory(options)
+
     override def getAfterDependents =
-      new ju.HashSet[Class[_ <: CustomBlockParserFactory]](ju.Arrays.asList(
+      new ju.HashSet[Class[?]](ju.Arrays.asList(
         classOf[BlockQuoteParser.Factory],
         classOf[HeadingParser.Factory],
         //FencedCodeBlockParser.Factory.class,
@@ -33,7 +37,7 @@ object WikiCodeBlockParser {
       ))
 
     override def getBeforeDependents =
-      new ju.HashSet[Class[_ <: CustomBlockParserFactory]](ju.Arrays.asList(
+      new ju.HashSet[Class[?]](ju.Arrays.asList(
         //BlockQuoteParser.Factory.class,
         //HeadingParser.Factory.class,
         //FencedCodeBlockParser.Factory.class,
@@ -44,9 +48,6 @@ object WikiCodeBlockParser {
       ))
 
     override def affectsGlobalScope = false
-
-    override def create(options: DataHolder) =
-      new WikiCodeBlockParser.BlockFactory(options)
   }
 
   private[WikiCodeBlockParser] class BlockFactory (val options: DataHolder)
@@ -83,7 +84,7 @@ class WikiCodeBlockParser(
 
   final private val block = new FencedCodeBlock()
   private var content = new BlockContent
-  private val codeContentBlock = options.get(Parser.FENCED_CODE_CONTENT_BLOCK)
+  private val codeContentBlock = Parser.FENCED_CODE_CONTENT_BLOCK.get(options)
 
   def getBlock: Block = block
   def getFenceIndent: Int = fenceIndent
@@ -141,7 +142,7 @@ class WikiCodeBlockParser(
           codeBlock.setCharsFromContent
           block.appendChild(codeBlock)
         } else {
-          val codeBlock = new Text(SegmentedSequence.of(segments))
+          val codeBlock = new Text(SegmentedSequence.create(segments.asScala.toSeq:_*))
           block.appendChild(codeBlock)
         }
       }

scaladoc/src/dotty/tools/scaladoc/site/FlexmarkSectionWrapper.scala

@@ -4,7 +4,6 @@ package site
 import com.vladsch.flexmark.util.{ast => mdu, sequence}
 import com.vladsch.flexmark.{ast => mda}
 import com.vladsch.flexmark.formatter.Formatter
-import com.vladsch.flexmark.util.options.MutableDataSet
 import scala.jdk.CollectionConverters._
 
 import dotty.tools.scaladoc.tasty.comments.markdown.Section

scaladoc/src/dotty/tools/scaladoc/site/common.scala

@@ -12,12 +12,13 @@ import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
 import com.vladsch.flexmark.ext.tables.TablesExtension
 import com.vladsch.flexmark.ext.yaml.front.matter.{AbstractYamlFrontMatterVisitor, YamlFrontMatterExtension}
 import com.vladsch.flexmark.parser.{Parser, ParserEmulationProfile}
-import com.vladsch.flexmark.util.options.{DataHolder, MutableDataSet}
 import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension
 import com.vladsch.flexmark.formatter.Formatter
 import com.vladsch.flexmark.html.HtmlRenderer
 
 import scala.jdk.CollectionConverters._
+import com.vladsch.flexmark.util.data.DataHolder
+import com.vladsch.flexmark.util.data.MutableDataSet
 
 val docsRootDRI: DRI = DRI(location = "_docs/index", symbolUUID = staticFileSymbolUUID)
 val apiPageDRI: DRI = DRI(location = "api/index")

scaladoc/src/dotty/tools/scaladoc/site/templates.scala

@@ -11,7 +11,6 @@ import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
 import com.vladsch.flexmark.ext.tables.TablesExtension
 import com.vladsch.flexmark.ext.yaml.front.matter.{AbstractYamlFrontMatterVisitor, YamlFrontMatterExtension}
 import com.vladsch.flexmark.parser.{Parser, ParserEmulationProfile}
-import com.vladsch.flexmark.util.options.{DataHolder, MutableDataSet}
 import com.vladsch.flexmark.html.HtmlRenderer
 import com.vladsch.flexmark.formatter.Formatter
 import liqp.Template

scaladoc/src/dotty/tools/scaladoc/snippets/FlexmarkSnippetProcessor.scala

@@ -4,7 +4,6 @@ package snippets
 import com.vladsch.flexmark.util.{ast => mdu, sequence}
 import com.vladsch.flexmark.{ast => mda}
 import com.vladsch.flexmark.formatter.Formatter
-import com.vladsch.flexmark.util.options.MutableDataSet
 import scala.jdk.CollectionConverters._
 
 import dotty.tools.scaladoc.tasty.comments.markdown.ExtendedFencedCodeBlock

scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala

@@ -7,7 +7,6 @@ import scala.util.Try
 import com.vladsch.flexmark.util.{ast => mdu, sequence}
 import com.vladsch.flexmark.{ast => mda}
 import com.vladsch.flexmark.formatter.Formatter
-import com.vladsch.flexmark.util.options.MutableDataSet
 import com.vladsch.flexmark.util.sequence.BasedSequence
 
 import scala.quoted._

scaladoc/src/dotty/tools/scaladoc/tasty/comments/MarkdownParser.scala

@@ -9,18 +9,19 @@ import com.vladsch.flexmark.formatter.Formatter
 import com.vladsch.flexmark.parser.Parser
 import com.vladsch.flexmark.util.sequence.CharSubSequence
 import com.vladsch.flexmark.parser.ParserEmulationProfile
-import com.vladsch.flexmark.ext.gfm.tables.TablesExtension
 import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension
 import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
 import com.vladsch.flexmark.ext.emoji.EmojiExtension
 import com.vladsch.flexmark.ext.autolink.AutolinkExtension
 import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension
 import com.vladsch.flexmark.ext.yaml.front.matter.YamlFrontMatterExtension
 import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension
-import com.vladsch.flexmark.util.options.{ DataHolder, MutableDataSet }
-import com.vladsch.flexmark.util.builder.Extension
 
 import scala.jdk.CollectionConverters._
+import com.vladsch.flexmark.util.misc.Extension
+import com.vladsch.flexmark.ext.tables.TablesExtension
+import com.vladsch.flexmark.util.data.MutableDataSet
+import com.vladsch.flexmark.util.data.DataHolder
 
 object MarkdownParser {
 

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

@@ -15,6 +15,9 @@ import com.vladsch.flexmark._
 
 import dotty.tools.scaladoc.snippets._
 import scala.jdk.CollectionConverters._
+import com.vladsch.flexmark.util.data.MutableDataHolder
+import com.vladsch.flexmark.util.data.DataHolder
+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler.CustomNodeRenderer
 
 class DocLinkNode(
   val target: DocLink,
@@ -40,7 +43,7 @@ class DocFlexmarkParser(resolveLink: String => DocLink) extends Parser.ParserExt
   class Factory extends LinkRefProcessorFactory:
     override def getBracketNestingLevel(options: DataHolder) = 1
     override def getWantExclamationPrefix(options: DataHolder) = false
-    override def create(doc: Document): LinkRefProcessor =
+    override def apply(doc: Document): LinkRefProcessor =
       new WikiLinkLinkRefProcessor(doc):
         override def createNode(nodeChars: BasedSequence): Node =
           val chars = nodeChars.toString.substring(2, nodeChars.length - 2)
@@ -75,7 +78,7 @@ case class DocFlexmarkRenderer(renderLink: (DocLink, String) => String)
         )
 
     object Factory extends NodeRendererFactory:
-      override def create(options: DataHolder): NodeRenderer = Render
+      override def apply(options: DataHolder): NodeRenderer = Render
 
     def extend(htmlRendererBuilder: HtmlRenderer.Builder, tpe: String): Unit =
       htmlRendererBuilder.nodeRendererFactory(Factory)

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

@@ -3,17 +3,23 @@ package tasty.comments.markdown
 
 import com.vladsch.flexmark.html.*
 import com.vladsch.flexmark.html.renderer.*
+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler.CustomNodeRenderer
 import com.vladsch.flexmark.parser.*
 import com.vladsch.flexmark.ext.wikilink.*
 import com.vladsch.flexmark.ext.wikilink.internal.WikiLinkLinkRefProcessor
 import com.vladsch.flexmark.util.ast.*
 import com.vladsch.flexmark.util.options.*
 import com.vladsch.flexmark.util.sequence.BasedSequence
-import com.vladsch.flexmark.util.html.{AttributeImpl, Attributes}
 import com.vladsch.flexmark.*
 import com.vladsch.flexmark.ast.FencedCodeBlock
 
 import scala.collection.mutable
+import com.vladsch.flexmark.util.data.MutableDataHolder
+import com.vladsch.flexmark.util.html.Attributes
+import com.vladsch.flexmark.util.html.AttributeImpl
+import com.vladsch.flexmark.util.data.DataHolder
+import com.vladsch.flexmark.util.html.Attribute
+import com.vladsch.flexmark.util.html.MutableAttributes
 
 
 object SectionRenderingExtension extends HtmlRenderer.HtmlRendererExtension:
@@ -30,18 +36,19 @@ object SectionRenderingExtension extends HtmlRenderer.HtmlRendererExtension:
       repeatedIds.update((c, header.getText), repeatedIds((c, header.getText)) + 1)
       val id = idGenerator.getId(header.getText.append(ifSuffixStr))
       val anchor = AnchorLink(s"#$id")
-      val attributes = Attributes()
       val headerClass: String = header.getLevel match
         case 1 => "h500"
         case 2 => "h500"
         case 3 => "h400"
         case 4 => "h300"
         case _ => "h50"
-      attributes.addValue(AttributeImpl.of("class", headerClass))
+      //val a: Attribute = AttributeImpl.of("class", headerClass)
+      val attributes = MutableAttributes()
+      attributes.addValue("class", headerClass)
       val embeddedAttributes = EmbeddedAttributeProvider.EmbeddedNodeAttributes(header, attributes)
       header.prependChild(embeddedAttributes)
       header.prependChild(anchor)
-      html.attr(AttributeImpl.of("id", id)).withAttr.tag("section", false, false, () => {
+      html.attr("id", id).withAttr.tag("section", false, false, () => {
         c.render(header)
         body.foreach(c.render)
       })
@@ -59,7 +66,8 @@ object SectionRenderingExtension extends HtmlRenderer.HtmlRendererExtension:
       )
 
   object Factory extends NodeRendererFactory:
-    override def create(options: DataHolder): NodeRenderer = Render
+    override def apply(options: DataHolder): NodeRenderer = Render
+
 
   def extend(htmlRendererBuilder: HtmlRenderer.Builder, tpe: String): Unit =
     htmlRendererBuilder.nodeRendererFactory(Factory)

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

@@ -13,6 +13,9 @@ import com.vladsch.flexmark.util.options._
 import com.vladsch.flexmark.util.sequence.BasedSequence
 import com.vladsch.flexmark._
 import com.vladsch.flexmark.ast.FencedCodeBlock
+import com.vladsch.flexmark.util.data.MutableDataHolder
+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler.CustomNodeRenderer
+import com.vladsch.flexmark.util.data.DataHolder
 
 /**
  * SnippetRenderingExtension is responsible for running an analysis for scala codeblocks in the static documentation/scaladoc comments.
@@ -39,7 +42,7 @@ object SnippetRenderingExtension extends HtmlRenderer.HtmlRendererExtension:
       )
 
   object Factory extends NodeRendererFactory:
-    override def create(options: DataHolder): NodeRenderer = Render
+    override def apply(options: DataHolder): NodeRenderer = Render
 
   def extend(htmlRendererBuilder: HtmlRenderer.Builder, tpe: String): Unit =
     htmlRendererBuilder.nodeRendererFactory(Factory)

scaladoc/test/dotty/tools/scaladoc/site/TemplateFileTests.scala

@@ -202,6 +202,7 @@ class TemplateFileTests:
         content -> "md"
       )
     )
+
   @Test
   def markdown(): Unit =
     testTemplate(
@@ -222,10 +223,10 @@ class TemplateFileTests:
       ext = "md"
     ) { t =>
       assertEquals(
-        """<section id="hello-there">
-        |<h1 class="h500"><a href="#hello-there" class="anchor"></a>Hello there!</h1>
+        """<section id="hello-there2">
+        |<h1 class="h500"><a href="#hello-there2" class="anchor"></a>Hello there2!</h1>
         |</section>""".stripMargin,
-      t.resolveInner(RenderingContext(Map("msg" -> "there"))).code.trim())
+      t.resolveInner(RenderingContext(Map("msg" -> "there2"))).code.trim())
     }
 
   @Test

scaladoc/test/dotty/tools/scaladoc/snippets/SnippetsE2eTest.scala

@@ -13,7 +13,6 @@ import dotty.tools.dotc.reporting.{ Diagnostic, StoreReporter }
 import com.vladsch.flexmark.util.{ast => mdu, sequence}
 import com.vladsch.flexmark.{ast => mda}
 import com.vladsch.flexmark.formatter.Formatter
-import com.vladsch.flexmark.util.options.MutableDataSet
 import scala.jdk.CollectionConverters._
 
 import dotty.tools.scaladoc.tasty.comments.markdown.ExtendedFencedCodeBlock