Update flexmark-java

- Version modification in Build.scala
- Import changed where needed

doc-tool/src/dotty/tools/dottydoc/model/comment/Comment.scala

@@ -6,7 +6,7 @@ package comment
 import dotty.tools.dottydoc.util.syntax._
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.util.Spans._
-import com.vladsch.flexmark.ast.{ Node => MarkdownNode }
+import com.vladsch.flexmark.util.ast.{ Node => MarkdownNode }
 import HtmlParsers._
 import util.MemberLookup
 

doc-tool/src/dotty/tools/dottydoc/model/comment/CommentParser.scala

@@ -11,7 +11,7 @@ import dotty.tools.dotc.printing.Formatting.hl
 import scala.collection.mutable
 import dotty.tools.dotc.config.Printers.dottydoc
 import scala.util.matching.Regex
-import com.vladsch.flexmark.ast.{ Node => MarkdownNode }
+import com.vladsch.flexmark.util.ast.{ Node => MarkdownNode }
 import com.vladsch.flexmark.parser.{ Parser => MarkdownParser }
 
 trait CommentParser extends util.MemberLookup {

doc-tool/src/dotty/tools/dottydoc/model/comment/HtmlParsers.scala

@@ -8,7 +8,7 @@ import dotc.util.Spans._
 import dotty.tools.dottydoc.util.syntax._
 import util.MemberLookup
 
-import com.vladsch.flexmark.ast.{ Node => MarkdownNode }
+import com.vladsch.flexmark.util.ast.{ Node => MarkdownNode}
 import com.vladsch.flexmark.html.HtmlRenderer
 import com.vladsch.flexmark.parser.Parser
 import com.vladsch.flexmark.util.sequence.CharSubSequence
@@ -17,7 +17,9 @@ object HtmlParsers {
 
   implicit class StringToMarkdown(val text: String) extends AnyVal {
     def toMarkdown(origin: Entity)(implicit ctx: Context): MarkdownNode = {
-      import com.vladsch.flexmark.ast.{ Link, Visitor, VisitHandler, NodeVisitor }
+      import com.vladsch.flexmark.ast.Link
+      import com.vladsch.flexmark.util.ast.{Visitor, VisitHandler, NodeVisitor }
+
 
       val inlineToHtml = InlineToHtml(origin)
 

doc-tool/src/dotty/tools/dottydoc/model/comment/MarkdownShortener.scala

@@ -10,6 +10,7 @@ package comment
   * @note calling `shorten` **will** mutate the Markdown AST node.
   */
 class MarkdownShortener {
+  import com.vladsch.flexmark.util.ast._
   import com.vladsch.flexmark.ast._
 
   def shorten(node: Node, maxLen: Int = 150): Node = {

doc-tool/src/dotty/tools/dottydoc/staticsite/MarkdownCodeBlockVisitor.scala

@@ -2,6 +2,7 @@ package dotty.tools
 package dottydoc
 package staticsite
 
+import com.vladsch.flexmark.util.ast._
 import com.vladsch.flexmark.ast._
 import com.vladsch.flexmark.util.sequence.CharSubSequence
 

doc-tool/src/dotty/tools/dottydoc/staticsite/MarkdownLinkVisitor.scala

@@ -3,6 +3,7 @@ package dottydoc
 package staticsite
 
 import com.vladsch.flexmark.ast._
+import com.vladsch.flexmark.util.ast._
 import com.vladsch.flexmark.util.sequence.{BasedSequence, CharSubSequence}
 import model.{Def, Package, TypeAlias, Val}
 import dottydoc.util.MemberLookup

project/Build.scala

@@ -351,6 +351,29 @@ object Build {
     )
   )
 
+  lazy val tastydocSettings = Seq(
+    baseDirectory in (Compile, run) := baseDirectory.value / "..",
+    baseDirectory in Test := baseDirectory.value / "..",
+    libraryDependencies +=
+      "com.novocode" % "junit-interface" % "0.11",
+    libraryDependencies ++= {
+      val flexmarkVersion = "0.40.24"
+      Seq(
+        "com.vladsch.flexmark" % "flexmark-all" % flexmarkVersion,
+        "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
+        "com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
+        "com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
+        "com.vladsch.flexmark" % "flexmark-ext-anchorlink" % flexmarkVersion,
+        "com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
+        "com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
+        "com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
+        Dependencies.`jackson-dataformat-yaml`,
+        "nl.big-o" % "liqp" % "0.6.7"
+      )
+    }
+  )
+
+  // Settings shared between dotty-doc and dotty-doc-bootstrapped
   def dottyDocSettings(implicit mode: Mode) = Seq(
     baseDirectory in (Compile, run) := baseDirectory.value / "..",
     baseDirectory in Test := baseDirectory.value / "..",
@@ -396,9 +419,9 @@ object Build {
     }.evaluated,
 
     libraryDependencies ++= {
-      val flexmarkVersion = "0.28.32"
+      val flexmarkVersion = "0.42.12"
       Seq(
-        "com.vladsch.flexmark" % "flexmark" % flexmarkVersion,
+        "com.vladsch.flexmark" % "flexmark-all" % flexmarkVersion,
         "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
         "com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
         "com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
@@ -976,6 +999,9 @@ object Build {
     addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.0.0" cross CrossVersion.full)
   )
 
+  lazy val `dotty-tastydoc` = project.in(file("tastydoc")).asDottyTastydoc(Bootstrapped)
+  lazy val `dotty-tastydoc-input` = project.in(file("tastydoc/input")).asDottyTastydocInput(Bootstrapped)
+
   // Depend on dotty-library so that sbt projects using dotty automatically
   // depend on the dotty-library
   lazy val `scala-library` = project.
@@ -1263,6 +1289,14 @@ object Build {
       dependsOn(dottyCompiler).
       settings(semanticdbSettings)
 
+    def asDottyTastydoc(implicit mode: Mode): Project = project.withCommonSettings.
+      aggregate(`dotty-tastydoc-input`).
+      dependsOn(dottyCompiler).
+      settings(tastydocSettings)
+
+    def asDottyTastydocInput(implicit mode: Mode): Project = project.withCommonSettings.
+      dependsOn(dottyCompiler)
+
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).
       withCommonSettings.