Merge pull request #168 from gokhanoner/update/scalafmt-core-2.7.5

Author: SethTisue

.scalafmt.conf

@@ -1,11 +1,10 @@
-version = 2.3.2
-edition = 2019-10
+version = 2.7.5
 
-style = default
+preset = default
+docstrings.style = Asterisk
 maxColumn = 120
 
 align.openParenCallSite = false
 align.openParenDefnSite = false
 
-# don't align arrows in match statements
-align.tokens = []
+align.preset = none

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

@@ -28,22 +28,22 @@ import scala.collection.JavaConverters._
 import scala.collection.mutable
 
 /**
-  * Filters coverage results from Scala synthetic methods:
-  * - 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.
-  *
-  * 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.
-  */
+ * Filters coverage results from Scala synthetic methods:
+ * - 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.
+ *
+ * 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.
+ */
 private final class FilteringClassAnalyzer(
     classCoverage: ClassCoverageImpl,
     classNode: ClassNode,

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

@@ -17,15 +17,16 @@ import org.objectweb.asm.tree.{JumpInsnNode, MethodInsnNode, MethodNode}
 
 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.
-  */
+/**
+ * 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.
+ */
 object ScalaForwarderDetector {
   val LazyComputeSuffix: String = "$lzycompute"
   def isScalaForwarder(className: String, node: MethodNode): Boolean = {

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

@@ -18,7 +18,7 @@ object ScalaSyntheticMethod {
     val isOneLiner = firstLine == lastLine
     isOneLiner && (
       (isModuleClass && isSyntheticObjectMethodName(name))
-      || isSyntheticInstanceMethodName(name)
+        || isSyntheticInstanceMethodName(name)
     )
   }
 

src/main/scala/com/github/sbt/jacoco/report/JacocoReportFormats.scala

@@ -19,21 +19,24 @@ object JacocoReportFormats {
   /** HTML report containing detailed metrics at instruction level and embedded source code. */
   val ScalaHTML = new ScalaHTMLReportFormat()
 
-  /** HTML report containing detailed metrics at instruction level and embedded source code.
-    *
-    * '''Note:''' does not support Scala language constructs.
-    */
+  /**
+   * HTML report containing detailed metrics at instruction level and embedded source code.
+   *
+   * '''Note:''' does not support Scala language constructs.
+   */
   val HTML = new HTMLReportFormat()
 
-  /** XML report containing detailed metrics at instruction level.
-    *
-    * '''Note:''' does not support Scala language constructs.
-    */
+  /**
+   * XML report containing detailed metrics at instruction level.
+   *
+   * '''Note:''' does not support Scala language constructs.
+   */
   val XML = new XMLReportFormat()
 
-  /** CSV report containing metrics at class level only.
-    *
-    * '''Note:''' does not support Scala language constructs.
-    */
+  /**
+   * CSV report containing metrics at class level only.
+   *
+   * '''Note:''' does not support Scala language constructs.
+   */
   val CSV = new CSVReportFormat()
 }

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

@@ -34,11 +34,11 @@ 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.
-  *
-  * TODO: Find a way to remove them from the annotated source code reports, too.
-  */
+ * 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.
+ */
 class ScalaHtmlFormatter(withBranchCoverage: Boolean) extends HTMLFormatter {
   private val table: Table = createTable