Remove `Context` from site generation

4 files changed, 26 insertions, 25 deletions

diff --git a/doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala b/doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala
index c2dd3fdef..c60038836 100644
--- a/doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala
@@ -5,12 +5,6 @@ package core
 import dotc.core.Symbols.Symbol
 import dotc.core.Comments.ContextDocstrings
 import model.Package
-import com.vladsch.flexmark.parser.ParserEmulationFamily
-import com.vladsch.flexmark.parser.Parser
-import com.vladsch.flexmark.ext.tables.TablesExtension
-import com.vladsch.flexmark.ext.front.matter.YamlFrontMatterExtension
-import com.vladsch.flexmark.util.options.{ DataHolder, MutableDataSet }
-import java.util.{ Collections => JCollections }
 
 class ContextDottydoc extends ContextDocstrings {
   import scala.collection.mutable
@@ -26,10 +20,4 @@ class ContextDottydoc extends ContextDocstrings {
   def addDef(s: Symbol, d: Symbol): Unit = _defs = (_defs + {
     s -> _defs.get(s).map(xs => xs + d).getOrElse(Set(d))
   })
-
-  val markdownOptions: DataHolder =
-    new MutableDataSet()
-      .setFrom(ParserEmulationFamily.KRAMDOWN.getOptions)
-      .set(Parser.EXTENSIONS, JCollections.singleton(TablesExtension.create()))
-      .set(Parser.EXTENSIONS, JCollections.singleton(YamlFrontMatterExtension.create()))
 }
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/comment/HtmlParsers.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/HtmlParsers.scala
index d3b695aac..a44c2fc1d 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/comment/HtmlParsers.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/comment/HtmlParsers.scala
@@ -21,7 +21,7 @@ object HtmlParsers {
 
       val inlineToHtml = InlineToHtml(origin)
 
-      val node = Parser.builder(ctx.docbase.markdownOptions)
+      val node = Parser.builder(staticsite.Site.markdownOptions)
         .build.parse(text)
 
 
@@ -64,7 +64,7 @@ object HtmlParsers {
 
   implicit class MarkdownToHtml(val markdown: MarkdownNode) extends AnyVal {
     def show(implicit ctx: Context): String =
-      HtmlRenderer.builder(ctx.docbase.markdownOptions).build().render(markdown)
+      HtmlRenderer.builder(staticsite.Site.markdownOptions).build().render(markdown)
 
     def shortenAndShow(implicit ctx: Context): String =
       (new MarkdownShortener).shorten(markdown).show
diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala
index 965ded4f8..a81e4143b 100644
--- a/doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala
@@ -2,14 +2,13 @@ package dotty.tools
 package dottydoc
 package staticsite
 
-import dotc.core.Contexts.Context
-import dotty.tools.dottydoc.util.syntax._
 import dotc.config.Printers.dottydoc
 
 import com.vladsch.flexmark.html.HtmlRenderer
 import com.vladsch.flexmark.parser.Parser
 import com.vladsch.flexmark.ext.front.matter.AbstractYamlFrontMatterVisitor
-import _root_.java.util.{ Map => JMap, List => JList }
+
+import java.util.{ Map => JMap, List => JList }
 
 case class IllegalFrontMatter(message: String) extends Exception(message)
 
@@ -20,20 +19,20 @@ trait Page {
   def pageContent: String
   def params: Map[String, AnyRef]
 
-  def yaml(implicit ctx: Context): Map[String, AnyRef] = {
+  def yaml: Map[String, AnyRef] = {
     if (_yaml eq null) initFields()
     _yaml
   }
 
-  def html(implicit ctx: Context): String = {
+  def html: String = {
     if (_html eq null) initFields()
     _html
   }
 
   protected[this] var _yaml: Map[String, AnyRef /* String | JList[String] */] = _
   protected[this] var _html: String = _
-  protected[this] def initFields()(implicit ctx: Context) = {
-    val md = Parser.builder(ctx.docbase.markdownOptions).build.parse(pageContent)
+  protected[this] def initFields() = {
+    val md = Parser.builder(Site.markdownOptions).build.parse(pageContent)
     val yamlCollector = new AbstractYamlFrontMatterVisitor()
     yamlCollector.visit(md)
 
@@ -88,13 +87,13 @@ class HtmlPage(fileContents: => String, val params: Map[String, AnyRef], val inc
 class MarkdownPage(fileContents: => String, val params: Map[String, AnyRef], val includes: Map[String, String]) extends Page {
   lazy val pageContent = fileContents
 
-  override protected[this] def initFields()(implicit ctx: Context) = {
+  override protected[this] def initFields() = {
     super.initFields()
-    val md = Parser.builder(ctx.docbase.markdownOptions).build.parse(_html)
+    val md = Parser.builder(Site.markdownOptions).build.parse(_html)
     // fix markdown linking
     MarkdownLinkVisitor(md)
     _html = HtmlRenderer
-      .builder(ctx.docbase.markdownOptions)
+      .builder(Site.markdownOptions)
       .escapeHtml(false)
       .build()
       .render(md)
diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
index f2ecc6350..1b40ddaea 100644
--- a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
@@ -5,11 +5,17 @@ package staticsite
 import java.nio.file.{ Files, FileSystems }
 import java.nio.file.StandardCopyOption.REPLACE_EXISTING
 import java.io.{ File => JFile }
-import java.util.{ List => JList }
+import java.util.{ List => JList, Map => JMap, Collections => JCollections }
 import java.nio.file.Path
 import java.io.ByteArrayInputStream
 import java.nio.charset.StandardCharsets
 
+import com.vladsch.flexmark.parser.ParserEmulationFamily
+import com.vladsch.flexmark.parser.Parser
+import com.vladsch.flexmark.ext.tables.TablesExtension
+import com.vladsch.flexmark.ext.front.matter.YamlFrontMatterExtension
+import com.vladsch.flexmark.util.options.{ DataHolder, MutableDataSet }
+
 import dotc.config.Printers.dottydoc
 import dotc.core.Contexts.Context
 import scala.io.Source
@@ -272,3 +278,11 @@ case class Site(val root: JFile, val docs: JList[_]) extends ResourceFinder {
         render(expandedTemplate, params)
     }
 }
+
+object Site {
+  val markdownOptions: DataHolder =
+    new MutableDataSet()
+      .setFrom(ParserEmulationFamily.KRAMDOWN.getOptions)
+      .set(Parser.EXTENSIONS, JCollections.singleton(TablesExtension.create()))
+      .set(Parser.EXTENSIONS, JCollections.singleton(YamlFrontMatterExtension.create()))
+}