Refactor for clarity, simplify test

Author: julianpeeters

mdoc/src/main/scala/mdoc/internal/markdown/Renderer.scala

@@ -2,7 +2,6 @@ package mdoc.internal.markdown
 
 import java.io.ByteArrayOutputStream
 import java.io.PrintStream
-import java.util.regex.Pattern
 import mdoc.Reporter
 import mdoc.Variable
 import mdoc.document.CompileResult
@@ -118,26 +117,15 @@ object Renderer {
           case None =>
             (Position.Range(input, 0, pos.start).text, "")
           case Some(previousStatement) =>
-            val betweenStatements =
-              section.source.pos.text.substring(previousStatement.pos.end, pos.start)
             val Array(prevTrailingSingleLineComment, leadingTrivia) =
-              betweenStatements.split(Pattern.quote("\n"), 2)
-            val footerAtEnd = {
+              section.source.pos.text.substring(previousStatement.pos.end, pos.start).split("\n", 2)
+            val foot =
               if (statementIndex != (totalStats - 1)) ""
-              else section.source.pos.text.substring(pos.end)
-            }
-            val lead =
-              // if no trailing single-line comments, then we can use the established `Position.Range` system
-              if (prevTrailingSingleLineComment.length == 0)
-                Position.Range(input, previousStatement.pos.end, pos.start).text
-              else "\n" + leadingTrivia
-            val footer = footerAtEnd.split(Pattern.quote("\n")).drop(1)
-            if (footer.nonEmpty)
-              (lead, footer.mkString("\n", "\n", ""))
-            else (lead, "")
+              else section.source.pos.text.substring(pos.end).split("\n").drop(1).mkString("\n", "\n", "")
+            ("\n" + leadingTrivia, foot)
         }
         if (!section.mod.isFailOrWarn) {
-          sb.append(leading )
+          sb.append(leading)
         }
         val endOfLinePosition =
           Position.Range(pos.input, pos.startLine, pos.startColumn, pos.endLine, Int.MaxValue)

tests/unit/src/test/scala/tests/markdown/DefaultSuite.scala

@@ -210,7 +210,7 @@ class DefaultSuite extends BaseMarkdownSuite {
       |Future.successful(Try(1))
       |val (a, b) = Future.successful(Try(1)) -> 2
       |
-      |Future.successful(Try(1))
+      |Future.successful(Try(1)) // last statement
       |
       |// penultimate
       |```
@@ -226,7 +226,7 @@ class DefaultSuite extends BaseMarkdownSuite {
        |// a: Future[Try[Int]] = Future(Success(Success(1)))
        |// b: Int = 2
        |
-       |Future.successful(Try(1))
+       |Future.successful(Try(1)) // last statement
        |// res1: Future[Try[Int]] = Future(Success(Success(1)))
        |
        |// penultimate
@@ -275,7 +275,7 @@ class DefaultSuite extends BaseMarkdownSuite {
       |x + y
       |
       |/** Docstring */
-      |class User()
+      |class User() // Comment 5
       |
       |// ultimate```
     """.stripMargin,
@@ -294,7 +294,7 @@ class DefaultSuite extends BaseMarkdownSuite {
        |// res0: Int = 4
        |
        |/** Docstring */
-       |class User()
+       |class User() // Comment 5
        |
        |// ultimate```
     """.stripMargin

tests/unit/src/test/scala/tests/markdown/VariablePrinterSuite.scala

@@ -7,15 +7,15 @@ class VariablePrinterSuite extends BaseMarkdownSuite {
     "single-line-comment",
     """
       |```scala mdoc
-      |import scala.None // an import statement
-      |val a = None // a variable
+      |import scala.Int // an import statement
+      |val a: Int = 1 // a variable
       |val b = 2 // another variable
       |```
     """.stripMargin,
     """|```scala
-       |import scala.None // an import statement
-       |val a = None // a variable
-       |// a: None.type = None
+       |import scala.Int // an import statement
+       |val a: Int = 1 // a variable
+       |// a: Int = 1
        |val b = 2 // another variable
        |// b: Int = 2
        |```