CRs

Author: pikinier20

project/Build.scala

@@ -1350,7 +1350,7 @@ object Build {
             s"-source-links:docs=github://lampepfl/dotty/master#docs",
             "-doc-root-content", docRootFile.toString,
             "-snippet-compiler:" +
-              s"$dottyLibRoot=compile" +
+              s"$dottyLibRoot=compile," +
               "docs=compile"
           )
         ))

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

@@ -43,15 +43,15 @@ class SnippetCompiler(
     if (msgOrNull == null) "" else msgOrNull
 
   private def createReportMessage(wrappedSnippet: WrappedSnippet, arg: SnippetCompilerArg, diagnostics: Seq[Diagnostic]): Seq[SnippetCompilerMessage] = {
-    val line = wrappedSnippet.lineOffset
-    val column = wrappedSnippet.columnOffset
-    val lineBoilerplate = wrappedSnippet.lineBoilerplate
+    val line = wrappedSnippet.outerLineOffset
+    val column = wrappedSnippet.outerColumnOffset
+    val innerLineOffset = wrappedSnippet.innerLineOffset
     val infos = diagnostics.toSeq.sortBy(_.pos.source.path)
     val errorMessages = infos.map {
       case diagnostic if diagnostic.position.isPresent =>
         val diagPos = diagnostic.position.get
         val pos = Some(
-          Position(diagPos.line + line, diagPos.column + column, diagPos.lineContent, if arg.debug then diagPos.line else diagPos.line - lineBoilerplate)
+          Position(diagPos.line + line, diagPos.column + column, diagPos.lineContent, if arg.debug then diagPos.line else diagPos.line - innerLineOffset)
         )
         val msg = nullableMessage(diagnostic.message)
         val level = MessageLevel.fromOrdinal(diagnostic.level)

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

@@ -4,11 +4,9 @@ package snippets
 import java.io.ByteArrayOutputStream
 import java.io.PrintStream
 
-case class WrappedSnippet(snippet: String, lineOffset: Int, columnOffset: Int, lineBoilerplate: Int, columnBoilerplate: Int)
+case class WrappedSnippet(snippet: String, outerLineOffset: Int, outerColumnOffset: Int, innerLineOffset: Int, innerColumnOffset: Int)
 
 object WrappedSnippet:
-  private val lineBoilerplate = 2
-  private val columnBoilerplate = 2
 
   def apply(str: String): WrappedSnippet =
     val baos = new ByteArrayOutputStream()
@@ -17,15 +15,15 @@ object WrappedSnippet:
     ps.println("object Snippet {")
     str.split('\n').foreach(ps.printlnWithIndent(2, _))
     ps.println("}")
-    WrappedSnippet(baos.toString, 0, 0, lineBoilerplate, columnBoilerplate)
+    WrappedSnippet(baos.toString, 0, 0, 2, 2)
 
   def apply(
     str: String,
     packageName: Option[String],
     classInfos: Seq[SnippetCompilerData.ClassInfo],
     imports: List[String],
-    lineOffset: Int,
-    columnOffset: Int
+    outerLineOffset: Int,
+    outerColumnOffset: Int
   ): WrappedSnippet =
     val baos = new ByteArrayOutputStream()
     val ps = new PrintStream(baos)
@@ -42,8 +40,8 @@ object WrappedSnippet:
     (0 to notEmptyClassInfos.size -1).reverse.foreach( i => ps.printlnWithIndent(i * 2, "}"))
     WrappedSnippet(
       baos.toString,
-      lineOffset,
-      columnOffset,
+      outerLineOffset,
+      outerColumnOffset,
       notEmptyClassInfos.size + notEmptyClassInfos.flatMap(_.names).size + packageName.size,
       notEmptyClassInfos.size * 2 + 2
     )