Fix positions in static sites. Enchance snippet wrapping

Author: pikinier20

docs/css/dottydoc.css

@@ -180,18 +180,6 @@ h5:hover a.anchor:hover {
   font-family: var(--font-family-monospace);
 }
 
-/* code */
-pre, code {
-  font-variant-ligatures: none;
-}
-pre {
-  padding: 0;
-  font-size: 13px;
-  background: var(--pre-bg);
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-}
-
 /* admonitions */
 blockquote {
   padding: 0 1em;

project/Build.scala

@@ -1651,7 +1651,8 @@ object Build {
                 s"docs=github://lampepfl/dotty/master#docs",
               "-doc-root-content", docRootFile.toString,
               "-snippet-compiler:" +
-                s"$dottyLibRoot=compile",
+                s"$dottyLibRoot=compile," +
+                "docs=compile",
               "-Ydocument-synthetic-types"
             )
           ))
@@ -1664,6 +1665,7 @@ object Build {
             "scaladoc/output/testcases",
             "master",
             Seq(
+              "-siteroot", "scaladoc-testcases/docs",
               "-snippet-compiler-debug"
             )
           )

scaladoc-testcases/docs/docs/index.md

@@ -7,3 +7,7 @@
 2 + List(0)
 ```
 
+```scala sc:compile
+new snippetCompiler.Snippet0 { }
+```
+

scaladoc/resources/dotty_res/styles/scalastyle.css

@@ -93,6 +93,7 @@ code {
   padding: 0 .3em;
 }
 pre {
+  overflow: visible;
   scrollbar-width: thin;
   margin: 0px;
 }

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

@@ -49,7 +49,8 @@ def emptyTemplate(file: File, title: String): TemplateFile = TemplateFile(
   title = title,
   hasFrame = true,
   resources = List.empty,
-  layout = None
+  layout = None,
+  configOffset = 0
 )
 
 final val ConfigSeparator = "---"
@@ -107,6 +108,7 @@ def loadTemplateFile(file: File): TemplateFile = {
     title = stringSetting(allSettings, "title").getOrElse(name),
     hasFrame = !stringSetting(allSettings, "hasFrame").contains("false"),
     resources = (listSetting(allSettings, "extraCSS") ++ listSetting(allSettings, "extraJS")).flatten.toList,
-    layout = stringSetting(allSettings, "layout")
+    layout = stringSetting(allSettings, "layout"),
+    configOffset = config.size
   )
 }

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

@@ -53,6 +53,7 @@ case class TemplateFile(
   hasFrame: Boolean,
   resources: List[String],
   layout: Option[String],
+  configOffset: Int
 ):
   def isIndexPage() = file.isFile && (file.getName == "index.md" || file.getName == "index.html")
 
@@ -63,7 +64,13 @@ case class TemplateFile(
       val pathBasedArg = ssctx.snippetCompilerArgs.get(path)
       (str: String, lineOffset: SnippetChecker.LineOffset, argOverride: Option[SCFlags]) => {
           val arg = argOverride.fold(pathBasedArg)(pathBasedArg.overrideFlag(_))
-          ssctx.snippetChecker.checkSnippet(str, None, arg, lineOffset).collect {
+          val compilerData = SnippetCompilerData(
+            "staticsitesnippet",
+            Seq(SnippetCompilerData.ClassInfo(None, Nil, None)),
+            Nil,
+            SnippetCompilerData.Position(configOffset - 1, 0)
+          )
+          ssctx.snippetChecker.checkSnippet(str, Some(compilerData), arg, lineOffset).collect {
               case r: SnippetCompilationResult if !r.isSuccessful =>
                 val msg = s"In static site (${file.getAbsolutePath}):\n${r.getSummary}"
                 report.error(msg)(using ssctx.outerCtx)

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

@@ -43,7 +43,7 @@ class SnippetCompilerDataCollector[Q <: Quotes](val qctx: Q):
               }
             }
           val classType =
-            val ct = cSym.classInfo.selfType.toText(printer).show.replace(".this","").stripPrefix(s"$packageName.")
+            val ct = cSym.classInfo.selfType.toText(printer).show.replace(".this","").replace("\n", " ").stripPrefix(s"$packageName.")
             Some(ct)
           val classNames = collectNames(cSym.classInfo.selfType)
           val classGenerics = Option.when(

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

@@ -31,15 +31,22 @@ object WrappedSnippet:
     val ps = new PrintStream(baos)
     ps.println(s"package ${packageName.getOrElse("snippets")}")
     imports.foreach(i => ps.println(s"import $i"))
-    classInfos.zipWithIndex.foreach { (info, i) =>
+    val notEmptyClassInfos = if classInfos.isEmpty then Seq(SnippetCompilerData.ClassInfo(None, Nil, None)) else classInfos
+    notEmptyClassInfos.zipWithIndex.foreach { (info, i) =>
       ps.printlnWithIndent(2 * i, s"trait Snippet$i${info.generics.getOrElse("")} { ${info.tpe.fold("")(cn => s"self: $cn =>")}")
       info.names.foreach{ name =>
         ps.printlnWithIndent(2 * i + 2, s"val $name = self")
       }
     }
-    str.split('\n').foreach(ps.printlnWithIndent(classInfos.size * 2, _))
-    (0 to classInfos.size -1).reverse.foreach( i => ps.printlnWithIndent(i * 2, "}"))
-    WrappedSnippet(baos.toString, lineOffset, columnOffset, classInfos.size + classInfos.flatMap(_.names).size, classInfos.size * 2 + 2)
+    str.split('\n').foreach(ps.printlnWithIndent(notEmptyClassInfos.size * 2, _))
+    (0 to notEmptyClassInfos.size -1).reverse.foreach( i => ps.printlnWithIndent(i * 2, "}"))
+    WrappedSnippet(
+      baos.toString,
+      lineOffset,
+      columnOffset,
+      notEmptyClassInfos.size + notEmptyClassInfos.flatMap(_.names).size + packageName.size,
+      notEmptyClassInfos.size * 2 + 2
+    )
 
   extension (ps: PrintStream) private def printlnWithIndent(indent: Int, str: String) =
     ps.println((" " * indent) + str)