Skip to content

Commit

Permalink
Update scalafmt-core to 2.3.2 (#104)
Browse files Browse the repository at this point in the history
* Update scalafmt-core to 2.3.2

Co-authored-by: Arnout Engelen <[email protected]>
  • Loading branch information
scala-steward and raboof committed Jan 2, 2020
1 parent 23944aa commit 2fbe322
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 2.2.2
version = 2.3.2

maxColumn = 120
docstrings = JavaDoc
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ scalafmtOnCompile := true

enablePlugins(SbtPlugin)
scriptedLaunchOpts += ("-Dproject.version=" + version.value)
scriptedLaunchOpts ++= java.lang.management.ManagementFactory.getRuntimeMXBean.getInputArguments.asScala.filter(
a => Seq("-Xmx", "-Xms", "-XX", "-Dfile").exists(a.startsWith)
scriptedLaunchOpts ++= java.lang.management.ManagementFactory.getRuntimeMXBean.getInputArguments.asScala.filter(a =>
Seq("-Xmx", "-Xms", "-XX", "-Dfile").exists(a.startsWith)
)

packageSrc / publishArtifact := false
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class ApidocDirective(allClassesAndObjects: IndexedSeq[String], ctx: Writer.Cont
scaladocNode("java", query.javaLabel(pkg), query.scalaFqcn(pkg) + scalaClassSuffix, jAnchor, node)
.accept(visitor)
case 2 if matches.forall(_.contains("adsl")) =>
matches.foreach(pkg => {
matches.foreach { pkg =>
if (!pkg.contains("javadsl"))
scaladocNode("scala", query.scalaLabel(pkg), query.scalaFqcn(pkg) + scalaClassSuffix, sAnchor, node)
.accept(visitor)
Expand All @@ -210,7 +210,7 @@ class ApidocDirective(allClassesAndObjects: IndexedSeq[String], ctx: Writer.Cont
scaladocNode("java", query.javaLabel(pkg), query.scalaFqcn(pkg) + scalaClassSuffix, jAnchor, node)
.accept(visitor)
}
})
}
case n =>
ctx.error(
s"$n matches found for $query, but not javadsl/scaladsl: ${matches.mkString(", ")}. " +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ class ApidocDirectiveSpec extends MarkdownBaseSpec {
linkRenderer = Writer.defaultLinks,
verbatimSerializers = Writer.defaultVerbatims,
serializerPlugins = Writer.defaultPlugins(
Writer.defaultDirectives ++ Seq(
(ctx: Writer.Context) => new ApidocDirective(allClasses, ctx)
)
Writer.defaultDirectives ++ Seq((ctx: Writer.Context) => new ApidocDirective(allClasses, ctx))
)
)

Expand Down

0 comments on commit 2fbe322

Please sign in to comment.