Merge branch 'flexmark-update' into tastydoc

Author: BryanAbate

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

@@ -419,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,