scalafmt-core 2.7.5 (was 2.6.4) (#170)

* scalafmt-core 2.7.5 (was 2.6.4)

* Reformat with scalafmt 2.7.5

Author: scala-steward

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 2.6.4
+version = 2.7.5
 
 maxColumn = 120
 docstrings = JavaDoc

src/main/scala/com/lightbend/paradox/apidoc/ApidocDirective.scala

@@ -32,8 +32,8 @@ import scala.util.matching.Regex
 class ApidocDirective(scanner: ScanResult, allClassesAndObjects: IndexedSeq[String], ctx: Writer.Context)
     extends InlineDirective("apidoc") {
   final val JavadocProperty = raw"""javadoc\.(.*)\.base_url""".r
-  final val JavadocBaseUrls = ctx.properties.collect {
-    case (JavadocProperty(pkg), url) => pkg -> url
+  final val JavadocBaseUrls = ctx.properties.collect { case (JavadocProperty(pkg), url) =>
+    pkg -> url
   }
 
   val allClasses = allClassesAndObjects.filterNot(_.endsWith("$"))
@@ -252,8 +252,8 @@ class ApidocDirective(scanner: ScanResult, allClassesAndObjects: IndexedSeq[Stri
       case n =>
         ctx.error(
           s"$n matches found for $query, but not javadsl/scaladsl: ${matches.mkString(", ")}. " +
-              s"You may want to use the fully qualified class name as @apidoc[fqcn] instead of @apidoc[$query]. " +
-              s"For examples see https://github.com/lightbend/sbt-paradox-apidoc#examples",
+            s"You may want to use the fully qualified class name as @apidoc[fqcn] instead of @apidoc[$query]. " +
+            s"For examples see https://github.com/lightbend/sbt-paradox-apidoc#examples",
           node
         )
     }

src/main/scala/com/lightbend/paradox/apidoc/ApidocPlugin.scala

@@ -38,25 +38,25 @@ object ApidocPlugin extends AutoPlugin {
     Seq(
       apidocRootPackage := "scala",
       apidocClasses := Def.taskDyn {
-            val classpathProjects = apidocProjects.?.value
-              .map(inProjects)
-              .getOrElse {
-                inAggregates(LocalRootProject, includeRoot = true)
-              }
-            val filter = ScopeFilter(classpathProjects, inConfigurations(Compile))
-            fullClasspath.all(filter).map(_.flatMap(_.files).map(_.toURI.toURL))
-          }.value,
+        val classpathProjects = apidocProjects.?.value
+          .map(inProjects)
+          .getOrElse {
+            inAggregates(LocalRootProject, includeRoot = true)
+          }
+        val filter = ScopeFilter(classpathProjects, inConfigurations(Compile))
+        fullClasspath.all(filter).map(_.flatMap(_.files).map(_.toURI.toURL))
+      }.value,
       paradoxDirectives ++= Def.taskDyn {
-            val classLoader = new java.net.URLClassLoader(apidocClasses.value.toArray, this.getClass.getClassLoader)
-            val scanner = new ClassGraph()
-              .whitelistPackages(apidocRootPackage.value)
-              .addClassLoader(classLoader)
-              .enableMethodInfo()
-              .scan()
-            val allClasses = scanner.getAllClasses.getNames.asScala.toVector
-            Def.task {
-              Seq((ctx: Writer.Context) => new ApidocDirective(scanner, allClasses, ctx))
-            }
-          }.value
+        val classLoader = new java.net.URLClassLoader(apidocClasses.value.toArray, this.getClass.getClassLoader)
+        val scanner = new ClassGraph()
+          .whitelistPackages(apidocRootPackage.value)
+          .addClassLoader(classLoader)
+          .enableMethodInfo()
+          .scan()
+        val allClasses = scanner.getAllClasses.getNames.asScala.toVector
+        Def.task {
+          Seq((ctx: Writer.Context) => new ApidocDirective(scanner, allClasses, ctx))
+        }
+      }.value
     )
 }

src/sbt-test/apidoc/multi-project/build.sbt

@@ -3,7 +3,7 @@ val lib = project
 val docs = project
   .enablePlugins(ParadoxPlugin)
   .settings(
-    paradoxTheme := None,
+    paradoxTheme  := None,
     paradoxGroups := Map("Language" -> Seq("Java", "Scala")),
     paradoxProperties ++= Map(
       "scaladoc.apidoc.base_url" -> "https://localhost:8000",

src/sbt-test/apidoc/scaladoc-for-java-class/build.sbt

@@ -1,7 +1,7 @@
 libraryDependencies += "com.typesafe.akka" %% "akka-stream-typed" % "2.5.25"
 
 enablePlugins(ParadoxPlugin)
-paradoxTheme := None
+paradoxTheme  := None
 paradoxGroups := Map("Language" -> Seq("Java", "Scala"))
 paradoxProperties ++= Map(
   "scaladoc.akka.base_url" -> "akka-scaladoc",

src/sbt-test/apidoc/single-project/build.sbt

@@ -1,7 +1,7 @@
 libraryDependencies += "com.typesafe.akka" %% "akka-stream" % "2.5.25"
 
 enablePlugins(ParadoxPlugin)
-paradoxTheme := None
+paradoxTheme  := None
 paradoxGroups := Map("Language" -> Seq("Java", "Scala"))
 paradoxProperties ++= Map(
   "scaladoc.akka.base_url" -> "https://doc.akka.io/api/akka/2.5",

src/test/scala/com/lightbend/paradox/apidoc/ApidocDirectiveSpec.scala

@@ -71,12 +71,12 @@ class ApidocDirectiveSpec extends MarkdownTestkit with Matchers with AnyFlatSpec
     verbatimSerializers = Writer.defaultVerbatims,
     serializerPlugins = Writer.defaultPlugins(
       Writer.defaultDirectives ++ Seq((ctx: Writer.Context) =>
-            new ApidocDirective(null: ScanResult, allClasses, ctx) {
-              override def containsOnlyStaticForwarders(classname: String): Boolean =
-                "akka.kafka.Metadata" == classname ||
-                  "akka.kafka.scaladsl.Producer" == classname
-            }
-          )
+        new ApidocDirective(null: ScanResult, allClasses, ctx) {
+          override def containsOnlyStaticForwarders(classname: String): Boolean =
+            "akka.kafka.Metadata" == classname ||
+            "akka.kafka.scaladsl.Producer" == classname
+        }
+      )
     )
   )