Merge pull request #170 from scala-steward/update/scalafmt-core-3.0.7

Author: SethTisue

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 2.7.5
+version = 3.0.7
 
 preset = default
 docstrings.style = Asterisk

build.sbt

@@ -9,7 +9,6 @@ ThisBuild / version := {
 ThisBuild / scalaVersion := "2.12.15"
 ThisBuild / licenses += (("Eclipse Public License v1.0", url("http://www.eclipse.org/legal/epl-v10.html")))
 
-
 lazy val jacocoPlugin = (project in file("."))
   .enablePlugins(SbtPlugin)
   .enablePlugins(BuildInfoPlugin)
@@ -19,15 +18,15 @@ lazy val jacocoPlugin = (project in file("."))
     name := "sbt-jacoco"
 
     libraryDependencies ++= Seq(
-      "org.jacoco"                  %  "org.jacoco.core"      % jacocoVersion,
-      "org.jacoco"                  %  "org.jacoco.report"    % jacocoVersion,
-      "com.jsuereth"                %% "scala-arm"            % "2.0",
-      "com.fasterxml.jackson.core"  %  "jackson-core"         % "2.13.0",
-      "org.scalaj"                  %% "scalaj-http"          % "2.4.2",
-      "commons-codec"               %  "commons-codec"        % "1.15",
-      "org.eclipse.jgit"            %  "org.eclipse.jgit"     % "5.13.0.202109080827-r",
-      "org.scalatest"               %% "scalatest"            % "3.2.10"         % Test,
-      "org.mockito"                 %  "mockito-core"          % "4.0.0"         % Test
+      "org.jacoco" % "org.jacoco.core" % jacocoVersion,
+      "org.jacoco" % "org.jacoco.report" % jacocoVersion,
+      "com.jsuereth" %% "scala-arm" % "2.0",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.13.0",
+      "org.scalaj" %% "scalaj-http" % "2.4.2",
+      "commons-codec" % "commons-codec" % "1.15",
+      "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.0.202109080827-r",
+      "org.scalatest" %% "scalatest" % "3.2.10" % Test,
+      "org.mockito" % "mockito-core" % "4.0.0" % Test
     )
 
     scalacOptions ++= Seq(
@@ -36,7 +35,8 @@ lazy val jacocoPlugin = (project in file("."))
       "-feature",
       "-Xfuture",
       "-Ywarn-adapted-args",
-      "-Ywarn-dead-code")
+      "-Ywarn-dead-code"
+    )
 
     buildInfoPackage := "com.github.sbt.jacoco.build"
     buildInfoKeys := Seq[BuildInfoKey](
@@ -49,8 +49,9 @@ lazy val jacocoPlugin = (project in file("."))
     Paradox / paradoxNavigationDepth := 3
     git.remoteRepo := "[email protected]:sbt/sbt-jacoco.git"
 
-    headerLicense := Some(HeaderLicense.Custom(
-      """|This file is part of sbt-jacoco.
+    headerLicense := Some(
+      HeaderLicense.Custom(
+        """|This file is part of sbt-jacoco.
          |
          |Copyright (c) Joachim Hofer & contributors
          |All rights reserved.
@@ -60,5 +61,6 @@ lazy val jacocoPlugin = (project in file("."))
          |which accompanies this distribution, and is available at
          |http://www.eclipse.org/legal/epl-v10.html
          |""".stripMargin
-    ))
+      )
+    )
   })

scripted.sbt

@@ -1,5 +1,6 @@
-scriptedLaunchOpts := { scriptedLaunchOpts.value ++
-  Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
+scriptedLaunchOpts := {
+  scriptedLaunchOpts.value ++
+    Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
 }
 
 scriptedBufferLog := false

src/main/scala/com/github/sbt/jacoco/filter/FilteringClassAnalyzer.scala

@@ -29,20 +29,19 @@ import scala.collection.mutable
 
 /**
  * Filters coverage results from Scala synthetic methods:
- * - trait forwarders
- * - case class toString / equals / apply / unapply
+ *   - trait forwarders
+ *   - case class toString / equals / apply / unapply
  *
- * These are identified by the heuristic that they have the same line number as a constructor, or
- * the same line as other one-line methods if we are in a module class.
+ * These are identified by the heuristic that they have the same line number as a constructor, or the same line as other
+ * one-line methods if we are in a module class.
  *
- * This filtering should really happen in Jacoco core, but the API for this is not available and
- * scheduled for Q1 2014.
+ * This filtering should really happen in Jacoco core, but the API for this is not available and scheduled for Q1 2014.
  *
  * See [[https://github.com/jacoco/jacoco/wiki/FilteringOptions]] and [[https://github.com/jacoco/jacoco/issues/139]]
  * for more discussion of the JaCoCo roadmap.
  *
- * These filters are based on [[https://github.com/timezra/jacoco/commit/b6146ebed8b8e7507ec634ee565fe03f3e940fdd]],
- * but extended to correctly exclude synthetics in module classes.
+ * These filters are based on [[https://github.com/timezra/jacoco/commit/b6146ebed8b8e7507ec634ee565fe03f3e940fdd]], but
+ * extended to correctly exclude synthetics in module classes.
  */
 private final class FilteringClassAnalyzer(
     classCoverage: ClassCoverageImpl,

src/main/scala/com/github/sbt/jacoco/filter/ScalaForwarderDetector.scala

@@ -19,13 +19,11 @@ import scala.collection.JavaConverters._
 
 /**
  * Detects forwarder methods added by Scala
- *  - classes and objects that mix in traits have a forwarder to the method body
- *    in the trait implementation class
- *  - classes contains static forwarders to methods in the companion object (for convenient Java interop)
- *  - methods in (boxed) value classes forward to the method body in the companion object
- *  - implicit classes creates a factory method beside the class.
- *  - lazy vals have an accessor that forwards to `\$lzycompute`, which is the method
- *    with the interesting code.
+ *   - classes and objects that mix in traits have a forwarder to the method body in the trait implementation class
+ *   - classes contains static forwarders to methods in the companion object (for convenient Java interop)
+ *   - methods in (boxed) value classes forward to the method body in the companion object
+ *   - implicit classes creates a factory method beside the class.
+ *   - lazy vals have an accessor that forwards to `\$lzycompute`, which is the method with the interesting code.
  */
 object ScalaForwarderDetector {
   val LazyComputeSuffix: String = "$lzycompute"

src/main/scala/com/github/sbt/jacoco/report/formats/ScalaHTMLReportFormat.scala

@@ -34,8 +34,8 @@ class ScalaHTMLReportFormat(withBranchCoverage: Boolean = true) extends JacocoRe
 }
 
 /**
- * Omits displaying instruction and branch coverage in the coverage tables,
- * as Scala generates null checks which make these too noisy.
+ * Omits displaying instruction and branch coverage in the coverage tables, as Scala generates null checks which make
+ * these too noisy.
  *
  * TODO: Find a way to remove them from the annotated source code reports, too.
  */

src/sbt-test/sbt-jacoco/csv-report/project/plugins.sbt

@@ -3,6 +3,5 @@
   if (pluginVersion == null)
     throw new RuntimeException("""|The system property 'plugin.version' is not defined.
                                   |Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)
-
   else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
 }

src/sbt-test/sbt-jacoco/csv-report/src/main/scala/jacocotest/TestClass.scala

@@ -1,8 +1,7 @@
 package jacocotest
 
-case class TestClass( val x : Int )
-{
-	def double() : Int = x * 2
-	
-	def triple() : Int = x * 3
-}
+case class TestClass(val x: Int) {
+  def double(): Int = x * 2
+
+  def triple(): Int = x * 3
+}

src/sbt-test/sbt-jacoco/csv-report/src/test/scala/jacocotest/TestClassTests.scala

@@ -2,10 +2,8 @@ package jacocotest
 
 import org.scalatest.flatspec._
 
-class TestClassTests extends AnyFlatSpec
-{
-	"TestClass" should "double a number correctly" in
-	{
-	    assert( new TestClass( 2 ).double === 4 )
-	}
+class TestClassTests extends AnyFlatSpec {
+  "TestClass" should "double a number correctly" in {
+    assert(new TestClass(2).double === 4)
+  }
 }

src/sbt-test/sbt-jacoco/forked-integration/build.sbt

@@ -6,4 +6,4 @@ scalaVersion := "2.12.15"
 enablePlugins(JacocoItPlugin)
 
 Test / fork := true
-IntegrationTest / fork := true
+IntegrationTest / fork := true