Remove preprocessor

Author: BarkingBad

build.sbt

@@ -22,7 +22,6 @@ val scaladoc = Build.scaladoc
 val `scaladoc-testcases` = Build.`scaladoc-testcases`
 val `scaladoc-js-common` = Build.`scaladoc-js-common`
 val `scaladoc-js-main` = Build.`scaladoc-js-main`
-val `scaladoc-js-markdown` = Build.`scaladoc-js-markdown`
 val `scaladoc-js-contributors` = Build.`scaladoc-js-contributors`
 val `scala3-bench-run` = Build.`scala3-bench-run`
 val dist = Build.dist

docs/docs/usage/ide-support.md

@@ -1,6 +1,7 @@
 ---
 layout: doc-page
 title: "IDE support for Scala 3"
+movedTo: https://docs.scala-lang.org/scala3/getting-started.html
 ---
 
 This page is deprecated. Please go to the [getting-started](https://docs.scala-lang.org/scala3/getting-started.html)

project/Build.scala

@@ -1251,7 +1251,6 @@ object Build {
   // Note: the two tasks below should be one, but a bug in Tasty prevents that
   val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib")
   val generateTestcasesDocumentation  = taskKey[Unit]("Generate documentation for testcases, usefull for debugging tests")
-  val renderScaladocScalajsToFile = inputKey[Unit]("Copy the output of the scaladoc js files")
 
   lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")).
     dependsOn(`scala3-compiler-bootstrapped`).
@@ -1260,9 +1259,8 @@ object Build {
 
   /**
    * Collection of projects building targets for scaladoc, these are:
-   * - common - common module for javascript shared among html and markdown outpu
+   * - common - common module for javascript
    * - main - main target for default scaladoc producing html webpage
-   * - markdown - companion js for preprocessing features. Can be later used with some templating engine
    * - contributors - not related project to any of forementioned modules. Used for presenting contributors for static site.
    *                   Made as an indepented project to be scaladoc-agnostic.
    */
@@ -1279,14 +1277,6 @@ object Build {
       Test / fork := false
     )
 
-  lazy val `scaladoc-js-markdown` = project.in(file("scaladoc-js/markdown")).
-    enablePlugins(DottyJSPlugin).
-    dependsOn(`scaladoc-js-common`).
-    settings(
-      scalaJSUseMainModuleInitializer := true,
-      Test / fork := false
-    )
-
   lazy val `scaladoc-js-contributors` = project.in(file("scaladoc-js/contributors")).
     enablePlugins(DottyJSPlugin).
     dependsOn(`scala3-library-bootstrappedJS`).
@@ -1434,23 +1424,6 @@ object Build {
         )
       }.value,
 
-      renderScaladocScalajsToFile := Def.inputTask {
-        val extraArgs = spaceDelimited("<arg>").parsed
-        val (destJS, destCSS, csses) = extraArgs match {
-          case js :: css :: tail => (js, css, tail)
-          case js :: Nil => (js, "", Nil)
-          case _ => throw new IllegalArgumentException("No js destination provided")
-        }
-        val jsDestinationFile: File = Paths.get(destJS).toFile
-        sbt.IO.copyFile((`scaladoc-js-markdown` / Compile / fullOptJS).value.data, jsDestinationFile)
-        csses.map { file =>
-          val cssDesitnationFile = Paths.get(destCSS).toFile / file
-          val cssSourceFile = (`scaladoc-js-markdown` / Compile / resourceDirectory).value / file
-          sbt.IO.copyFile(cssSourceFile, cssDesitnationFile)
-          cssDesitnationFile
-        }
-      }.evaluated,
-
       Test / buildInfoKeys := Seq[BuildInfoKey](
         (Test / Build.testcasesOutputDir),
         (Test / Build.testcasesSourceRoot),

scaladoc-js/markdown/src/Main.scala

@@ -60,7 +60,6 @@ object Scaladoc:
     generateInkuire : Boolean = false,
     apiSubdirectory : Boolean = false,
     scastieConfiguration: String = "",
-    projectFormat: String = "html",
     defaultTemplate: Option[String] = None,
   )
 
@@ -239,7 +238,6 @@ object Scaladoc:
         generateInkuire.get,
         apiSubdirectory.get,
         scastieConfiguration.get,
-        projectFormat.get,
         defaultTemplate.nonDefault
       )
       (Some(docArgs), newContext)
@@ -248,11 +246,6 @@ object Scaladoc:
   private [scaladoc] def run(args: Args)(using ctx: CompilerContext): DocContext =
     given docContext: DocContext = new DocContext(args, ctx)
     val module = ScalaModuleProvider.mkModule()
-
-    val renderer = args.projectFormat match
-      case "html" => new dotty.tools.scaladoc.renderers.HtmlRenderer(module.rootPackage, module.members)
-      case "md" => new dotty.tools.scaladoc.renderers.MarkdownRenderer(module.rootPackage, module.members)
-
-    renderer.render()
+    new dotty.tools.scaladoc.renderers.HtmlRenderer(module.rootPackage, module.members).render()
     report.inform("generation completed successfully")
     docContext

scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala

@@ -125,16 +125,6 @@ class ScaladocSettings extends SettingGroup with AllScalaSettings:
   val scastieConfiguration: Setting[String] =
     StringSetting("-scastie-configuration", "Scastie configuration", "Additional configuration passed to Scastie in code snippets", "")
 
-  val projectFormat: Setting[String] =
-    ChoiceSetting(
-      "-format",
-      "format of the static site output",
-      "Format of the static site output. The default value is html, which converts all static articles into a webpage. " +
-        "The md format only preprocess markdown files and should not be used as a direct output, but rather as a sources generator for an outer templating engine like Jekyll",
-      List("html", "md"),
-      "html"
-    )
-
   val defaultTemplate: Setting[String] =
     StringSetting(
       "-default-template",

scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala

@@ -56,24 +56,11 @@ trait SiteRenderer(using DocContext) extends Locations:
       else
         processLocalLink(str)
 
-    summon[DocContext].args.projectFormat match
-      case "html" =>
-        val document = Jsoup.parse(content.resolved.code)
-        document.select("a").forEach(element =>
-          element.attr("href", processLocalLinkWithGuard(element.attr("href")))
-        )
-        document.select("img").forEach { element =>
-          element.attr("src", processLocalLink(element.attr("src")))
-        } // foreach does not work here. Why?
-        raw(document.outerHtml())
-      case "md" =>
-        val links = """(?<!\\!)\[(.*)\\]\\((.*)\\)""".r
-        val imgs = """!\\[(.*)\\]\\((.*)\\)""".r
-
-        raw(links.replaceAllIn(
-          imgs.replaceAllIn(
-            content.resolved.code,
-            m => s"[${m.group(1)}](${processLocalLink(m.group(2))})"
-          ),
-          m => s"[${m.group(1)}](${processLocalLinkWithGuard(m.group(2))})"
-        ))
+    val document = Jsoup.parse(content.resolved.code)
+    document.select("a").forEach(element =>
+      element.attr("href", processLocalLinkWithGuard(element.attr("href")))
+    )
+    document.select("img").forEach { element =>
+      element.attr("src", processLocalLink(element.attr("src")))
+    } // foreach does not work here. Why?
+    raw(document.outerHtml())

scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala

@@ -37,10 +37,7 @@ def defaultMarkdownOptions(using ctx: StaticSiteContext): DataHolder =
       YamlFrontMatterExtension.create(),
       StrikethroughExtension.create(),
       WikiLinkExtension.create(),
-      (ctx.args.projectFormat match
-        case "html" => tasty.comments.markdown.SnippetRenderingExtension
-        case "md" => tasty.comments.markdown.SnippetFormattingExtension
-      ),
+      tasty.comments.markdown.SnippetRenderingExtension
     ))
 
 def emptyTemplate(file: File, title: String): TemplateFile = TemplateFile(

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

@@ -92,7 +92,7 @@ case class TemplateFile(
     if (ctx.resolving.contains(file.getAbsolutePath))
       throw new RuntimeException(s"Cycle in templates involving $file: ${ctx.resolving}")
 
-    val layoutTemplate = layout.filter(_ => ssctx.args.projectFormat == "html").map(name =>
+    val layoutTemplate = layout.map(name =>
       ctx.layouts.getOrElse(name, throw new RuntimeException(s"No layouts named $name in ${ctx.layouts}")))
 
     def asJavaElement(o: Object): Object = o match
@@ -105,24 +105,17 @@ case class TemplateFile(
     // Library requires mutable maps..
     val mutableProperties = new JHashMap(ctx.properties.transform((_, v) => asJavaElement(v)).asJava)
 
-    val rendered = ssctx.args.projectFormat match
-        case "html" => Template.parse(this.rawCode).render(mutableProperties)
-        case "md" => this.rawCode
+    val rendered = Template.parse(this.rawCode).render(mutableProperties)
 
     // We want to render markdown only if next template is html
     val code = if (isHtml || layoutTemplate.exists(!_.isHtml)) rendered else
       // Snippet compiler currently supports markdown only
       val parser: Parser = Parser.builder(defaultMarkdownOptions).build()
       val parsedMd = parser.parse(rendered)
       val processed = FlexmarkSnippetProcessor.processSnippets(parsedMd, None, snippetCheckingFunc, withContext = false)(using ssctx.outerCtx)
+      HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed)
 
-      ssctx.args.projectFormat match
-        case "html" => HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed)
-        case "md" => FrontMatterRenderer.render(ctx.properties ++ settings) +
-                      Formatter.builder(defaultMarkdownOptions).build().render(processed)
-
-
-    if layoutTemplate.isEmpty || ssctx.args.projectFormat == "md" then
+    if layoutTemplate.isEmpty then
       ResolvedPage(code, resources ++ ctx.resources)
     else
       layoutTemplate.get.resolveInner(ctx.nest(code, file, resources))