Skip to content

Commit

Permalink
Merge branch 'main' into update/fansi-0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik committed Apr 17, 2024
2 parents 59c6a30 + 0c1a90c commit bfac502
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.13
f872257dee6eaeb9810d77b3ded0bfd6784cafce

# Scala Steward: Reformat with scalafmt 3.8.1
00e881f146a6aa5f89378b3149b978a50c720b93
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.17"
version = "3.8.1"
runner.dialect = scala213
maxColumn = 100
project.git = true
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ lazy val sharedJavaSettings = List(
)

val V = new {
val scalameta = "4.9.1"
val scalameta = "4.9.3"
val munit = "1.0.0-M11"
val coursier = "1.0.19"
val scalacheck = "1.17.0"
val pprint = "0.8.1"
val pprint = "0.9.0"
val fansi = "0.5.0"
val fs2 = "3.10.2"
val metaconfig = "0.12.0"
Expand Down Expand Up @@ -239,7 +239,7 @@ lazy val mdoc = project
// live reload
"io.undertow" % "undertow-core" % "2.2.24.Final",
"org.jboss.xnio" % "xnio-nio" % "3.8.13.Final",
"org.slf4j" % "slf4j-api" % "2.0.12",
"org.slf4j" % "slf4j-api" % "2.0.13",
"com.geirsson" %% "metaconfig-typesafe-config" % V.metaconfig,
"com.lihaoyi" %% "fansi" % V.fansi,
"com.lihaoyi" %% "pprint" % V.pprint
Expand Down
7 changes: 6 additions & 1 deletion mdoc/src/main/scala/mdoc/internal/markdown/Renderer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,12 @@ object Renderer {
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).split("\n").drop(1).mkString("\n", "\n", "")
else
section.source.pos.text
.substring(pos.end)
.split("\n")
.drop(1)
.mkString("\n", "\n", "")
("\n" + leadingTrivia, foot)
}
if (!section.mod.isFailOrWarn) {
Expand Down

0 comments on commit bfac502

Please sign in to comment.