Merge pull request #604 from SethTisue/scalafmt-upgrade

Author: SethTisue

.scalafmt.conf

@@ -1,7 +1,14 @@
-version=1.5.1
-align = more
-docstrings = JavaDoc
-assumeStandardLibraryStripMargin = true
+version = 3.7.4
+runner.dialect = scala3
+align.preset = none
+docstrings.style = keep
+rewrite.trailingCommas.style = keep
+align.openParenDefnSite = true
+newlines.avoidInResultType = true
+danglingParentheses.defnSite = false
+danglingParentheses.callSite = false
+newlines.source = keep
+newlines.implicitParamListModifierPrefer = before
 project.git = true
 maxColumn = 100
 project.excludeFilters = [
@@ -12,5 +19,3 @@ project.excludeFilters = [
   "scalafix/output213/"
   "scalafix/output213-failure/"
 ]
-
-

admin/scalafmt.sh

@@ -3,7 +3,7 @@
 # set -x
 
 HERE="`dirname $0`"
-VERSION="1.5.1"
+VERSION="3.7.4"
 COURSIER="$HERE/.coursier"
 SCALAFMT="$HERE/.scalafmt-$VERSION"
 
@@ -15,7 +15,7 @@ if [ ! -f $COURSIER ]; then
 fi
 
 if [ ! -f $SCALAFMT ]; then
-  $COURSIER bootstrap com.geirsson:scalafmt-cli_2.11:$VERSION --main org.scalafmt.cli.Cli -o $SCALAFMT
+  $COURSIER bootstrap org.scalameta:scalafmt-cli_2.12:$VERSION --main org.scalafmt.cli.Cli -o $SCALAFMT
   chmod +x $SCALAFMT
 fi
 

binary-compat/test/src/test/scala/BinaryCompaTest.scala

@@ -21,7 +21,7 @@ import com.typesafe.tools.mima.lib.MiMaLib
 class BinaryCompaTest {
   @Test
   def compat(): Unit = {
-    val mima        = new MiMaLib(Seq())
+    val mima = new MiMaLib(Seq())
     val allProblems = mima.collectProblems(new File(oldClasses), new File(newClasses))
     val unexpectedDescriptions =
       allProblems.iterator

build.sbt

@@ -53,7 +53,7 @@ lazy val junit = libraryDependencies += "com.github.sbt" % "junit-interface" % "
 lazy val scala211 = "2.11.12"
 lazy val scala212 = "2.12.17"
 lazy val scala213 = "2.13.11"
-lazy val scala3   = "3.2.2"
+lazy val scala3 = "3.2.2"
 
 lazy val compat = new MultiScalaCrossProject(
   "compat",
@@ -87,7 +87,9 @@ lazy val compat = new MultiScalaCrossProject(
         import com.typesafe.tools.mima.core._
         import com.typesafe.tools.mima.core.ProblemFilters._
         Seq(
-          exclude[ReversedMissingMethodProblem]("scala.collection.compat.PackageShared.*"), // it's package-private
+          exclude[ReversedMissingMethodProblem](
+            "scala.collection.compat.PackageShared.*"
+          ), // it's package-private
           exclude[Problem]("scala.collection.compat.*PreservingBuilder*")
         )
       }
@@ -115,7 +117,7 @@ lazy val compat = new MultiScalaCrossProject(
         .head
       val opt = CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((3, _)) => "-scalajs-mapSourceURI"
-        case _            => "-P:scalajs:mapSourceURI"
+        case _ => "-P:scalajs:mapSourceURI"
       }
       Seq(s"$opt:$x->$y/")
     },
@@ -135,7 +137,7 @@ lazy val compat = new MultiScalaCrossProject(
     nativeLinkStubs := true,
     mimaPreviousArtifacts := (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, 1)) => mimaPreviousArtifacts.value.filter(_.revision != "2.6.0")
-      case _            => mimaPreviousArtifacts.value
+      case _ => mimaPreviousArtifacts.value
     }),
     Compile / unmanagedSourceDirectories += {
       val jsAndNativeSourcesParent = (ThisBuild / baseDirectory).value / "compat/jsNative/src/main"
@@ -155,20 +157,20 @@ lazy val compat = new MultiScalaCrossProject(
 val compat211 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala211)
 val compat212 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala212)
 val compat213 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala213)
-val compat3   = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala3)
+val compat3 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala3)
 
-lazy val compat211JVM    = compat211.jvm
-lazy val compat211JS     = compat211.js
+lazy val compat211JVM = compat211.jvm
+lazy val compat211JS = compat211.js
 lazy val compat211Native = compat211.native
-lazy val compat212JVM    = compat212.jvm
-lazy val compat212JS     = compat212.js
+lazy val compat212JVM = compat212.jvm
+lazy val compat212JS = compat212.js
 lazy val compat212Native = compat212.native
-lazy val compat213JVM    = compat213.jvm
-lazy val compat213JS     = compat213.js
+lazy val compat213JVM = compat213.jvm
+lazy val compat213JS = compat213.js
 lazy val compat213Native = compat213.native
-lazy val compat3JVM      = compat3.jvm
-lazy val compat3JS       = compat3.js
-lazy val compat3Native   = compat3.native
+lazy val compat3JVM = compat3.jvm
+lazy val compat3JS = compat3.js
+lazy val compat3Native = compat3.native
 
 lazy val binaryCompatOld = project
   .in(file("binary-compat/old"))
@@ -331,12 +333,12 @@ lazy val scalafixTests = project
   .enablePlugins(BuildInfoPlugin, ScalafixTestkitPlugin)
 
 val ciScalaVersion = sys.env.get("CI_SCALA_VERSION").flatMap(Version.parse)
-val ciPlatform     = sys.env.get("CI_PLATFORM").map(p => if (p == "JVM") "" else p)
-val isScalafix     = sys.env.get("CI_MODE") == Some("testScalafix")
-val isScalafmt     = sys.env.get("CI_MODE") == Some("testScalafmt")
+val ciPlatform = sys.env.get("CI_PLATFORM").map(p => if (p == "JVM") "" else p)
+val isScalafix = sys.env.get("CI_MODE") == Some("testScalafix")
+val isScalafmt = sys.env.get("CI_MODE") == Some("testScalafmt")
 val isBinaryCompat = sys.env.get("CI_MODE") == Some("testBinaryCompat")
-val isHeaderCheck  = sys.env.get("CI_MODE") == Some("headerCheck")
-val jdkVersion     = sys.env.get("CI_JDK").map(_.toInt)
+val isHeaderCheck = sys.env.get("CI_MODE") == Some("headerCheck")
+val jdkVersion = sys.env.get("CI_JDK").map(_.toInt)
 
 // required by sbt-scala-module
 inThisBuild {
@@ -365,7 +367,7 @@ inThisBuild {
           ).foreach(k =>
             println(k.padTo(20, " ").mkString("") + " -> " + sys.env.getOrElse(k, "None")))
 
-          val compatProject       = s"compat${ciScalaVersion.get}${ciPlatform.get}"
+          val compatProject = s"compat${ciScalaVersion.get}${ciPlatform.get}"
           val binaryCompatProject = "binaryCompat"
 
           val testProjectPrefix =

compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionShape.scala

@@ -41,7 +41,7 @@ object OptionShape {
 
       def fromScala(o: Option[Double]): OptionalDouble = o match {
         case Some(d) => OptionalDouble.of(d)
-        case _       => OptionalDouble.empty
+        case _ => OptionalDouble.empty
       }
     }
   implicit val jDoubleOptionShape: OptionShape[jl.Double, OptionalDouble] =
@@ -53,7 +53,7 @@ object OptionShape {
 
     def fromScala(o: Option[Int]): OptionalInt = o match {
       case Some(d) => OptionalInt.of(d)
-      case _       => OptionalInt.empty
+      case _ => OptionalInt.empty
     }
   }
   implicit val jIntegerOptionShape: OptionShape[jl.Integer, OptionalInt] =
@@ -66,7 +66,7 @@ object OptionShape {
 
       def fromScala(o: Option[Long]): OptionalLong = o match {
         case Some(d) => OptionalLong.of(d)
-        case _       => OptionalLong.empty
+        case _ => OptionalLong.empty
       }
     }
   implicit val jLongOptionShape: OptionShape[jl.Long, OptionalLong] =

compat/src/main/scala-2.11/scala/collection/compat/package.scala

@@ -28,17 +28,17 @@ package object compat extends compat.PackageShared {
   // the strict type of the view to be `Map` instead of `Iterable`
   // Instances produced by this method are used to chain `filterKeys` after `mapValues`
   implicit def canBuildFromIterableViewMapLike[K, V, L, W, CC[X, Y] <: Map[X, Y]]
-    : CanBuildFrom[IterableView[(K, V), CC[K, V]], (L, W), IterableView[(L, W), CC[L, W]]] =
+      : CanBuildFrom[IterableView[(K, V), CC[K, V]], (L, W), IterableView[(L, W), CC[L, W]]] =
     new CanBuildFrom[IterableView[(K, V), CC[K, V]], (L, W), IterableView[(L, W), CC[L, W]]] {
       // `CanBuildFrom` parameters are used as type constraints, they are not used
       // at run-time, hence the dummy builder implementations
       def apply(from: IterableView[(K, V), CC[K, V]]) = new TraversableView.NoBuilder
-      def apply()                                     = new TraversableView.NoBuilder
+      def apply() = new TraversableView.NoBuilder
     }
 
   implicit def toTraversableLikeExtensionMethods[Repr](self: Repr)(
-      implicit traversable: IsTraversableLike[Repr])
-    : TraversableLikeExtensionMethods[traversable.A, Repr] =
+      implicit
+      traversable: IsTraversableLike[Repr]): TraversableLikeExtensionMethods[traversable.A, Repr] =
     new TraversableLikeExtensionMethods[traversable.A, Repr](traversable.conversion(self))
 
   implicit def toSeqExtensionMethods[A](self: c.Seq[A]): SeqExtensionMethods[A] =

compat/src/main/scala-2.11/scala/util/Using.scala

@@ -145,7 +145,7 @@ object Using {
   final class Manager private {
     import Manager._
 
-    private var closed                             = false
+    private var closed = false
     private[this] var resources: List[Resource[_]] = Nil
 
     /** Registers the specified resource with this manager, so that
@@ -232,12 +232,12 @@ object Using {
 
   private def preferentiallySuppress(primary: Throwable, secondary: Throwable): Throwable = {
     def score(t: Throwable): Int = t match {
-      case _: VirtualMachineError                   => 4
-      case _: LinkageError                          => 3
+      case _: VirtualMachineError => 4
+      case _: LinkageError => 3
       case _: InterruptedException | _: ThreadDeath => 2
-      case _: ControlThrowable                      => 0
-      case e if !NonFatal(e)                        => 1 // in case this method gets out of sync with NonFatal
-      case _                                        => -1
+      case _: ControlThrowable => 0
+      case e if !NonFatal(e) => 1 // in case this method gets out of sync with NonFatal
+      case _ => -1
     }
     // special-case `ControlThrowable`, which incorrectly suppresses exceptions
     //   before 2.13

compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala

@@ -40,7 +40,7 @@ object BuildFrom {
       implicit cbf: CanBuildFrom[From, A, C]): BuildFrom[From, A, C] =
     new BuildFrom[From, A, C] {
       def fromSpecific(from: From)(it: IterableOnce[A]): C = (cbf(from) ++= it).result()
-      def newBuilder(from: From): mutable.Builder[A, C]    = cbf(from)
+      def newBuilder(from: From): mutable.Builder[A, C] = cbf(from)
     }
 
   // Implicit conversion derived from an implicit conversion to CanBuildFrom

compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala

@@ -24,9 +24,9 @@ private abstract class PreservingBuilder[A, C <: TraversableOnce[A]] extends m.B
   val that: m.Builder[A, C]
   val ct: ClassTag[C]
 
-  //invariant: ruined => (collection == null)
+  // invariant: ruined => (collection == null)
   var collection: C = null.asInstanceOf[C]
-  var ruined        = false
+  var ruined = false
 
   private[this] def ruin(): Unit = {
     if (collection != null) that ++= collection
@@ -80,9 +80,9 @@ private[compat] object CompatImpl {
   def simpleCBF[A, C](f: => m.Builder[A, C]): CanBuildFrom[Any, A, C] =
     new CanBuildFrom[Any, A, C] {
       def apply(from: Any): m.Builder[A, C] = apply()
-      def apply(): m.Builder[A, C]          = f
+      def apply(): m.Builder[A, C] = f
     }
 
   type ImmutableBitSetCC[X] = ({ type L[_] = i.BitSet })#L[X]
-  type MutableBitSetCC[X]   = ({ type L[_] = m.BitSet })#L[X]
+  type MutableBitSetCC[X] = ({ type L[_] = m.BitSet })#L[X]
 }

compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala

@@ -396,8 +396,8 @@ class StreamExtensionMethods[A](private val stream: Stream[A]) extends AnyVal {
 }
 
 class SortedExtensionMethods[K, T <: Sorted[K, T]](private val fact: Sorted[K, T]) {
-  def rangeFrom(from: K): T   = fact.from(from)
-  def rangeTo(to: K): T       = fact.to(to)
+  def rangeFrom(from: K): T = fact.from(from)
+  def rangeTo(to: K): T = fact.to(to)
   def rangeUntil(until: K): T = fact.until(until)
 }
 
@@ -409,7 +409,7 @@ class IteratorExtensionMethods[A](private val self: c.Iterator[A]) extends AnyVa
     if (self.hasNext) Some(self.next()) else None
   }
   def concat[B >: A](that: c.TraversableOnce[B]): c.TraversableOnce[B] = self ++ that
-  def tapEach[U](f: A => U): c.Iterator[A]                             = self.map(a => { f(a); a })
+  def tapEach[U](f: A => U): c.Iterator[A] = self.map(a => { f(a); a })
 }
 
 class TraversableOnceExtensionMethods[A](private val self: c.TraversableOnce[A]) extends AnyVal {
@@ -447,8 +447,8 @@ class TraversableOnceExtensionMethods[A](private val self: c.TraversableOnce[A])
 class TraversableExtensionMethods[A](private val self: c.Traversable[A]) extends AnyVal {
   def iterableFactory: GenericCompanion[Traversable] = self.companion
 
-  def sizeCompare(otherSize: Int): Int         = SizeCompareImpl.sizeCompareInt(self)(otherSize)
-  def sizeIs: SizeCompareOps                   = new SizeCompareOps(self)
+  def sizeCompare(otherSize: Int): Int = SizeCompareImpl.sizeCompareInt(self)(otherSize)
+  def sizeIs: SizeCompareOps = new SizeCompareOps(self)
   def sizeCompare(that: c.Traversable[_]): Int = SizeCompareImpl.sizeCompareColl(self)(that)
 
 }
@@ -486,7 +486,7 @@ private object SizeCompareImpl {
       case _ =>
         if (otherSize < 0) 1
         else {
-          var i  = 0
+          var i = 0
           val it = self.toIterator
           while (it.hasNext) {
             if (i == otherSize) return 1
@@ -532,7 +532,7 @@ class TraversableLikeExtensionMethods[A, Repr](private val self: c.GenTraversabl
     val r = bf2()
     self.foreach { x =>
       f(x) match {
-        case Left(x1)  => l += x1
+        case Left(x1) => l += x1
         case Right(x2) => r += x2
       }
     }
@@ -543,7 +543,7 @@ class TraversableLikeExtensionMethods[A, Repr](private val self: c.GenTraversabl
       implicit bf: CanBuildFrom[Repr, B, That]): Map[K, That] = {
     val map = m.Map.empty[K, m.Builder[B, That]]
     for (elem <- self) {
-      val k    = key(elem)
+      val k = key(elem)
       val bldr = map.getOrElseUpdate(k, bf(self.repr))
       bldr += f(elem)
     }
@@ -558,7 +558,7 @@ class TraversableLikeExtensionMethods[A, Repr](private val self: c.GenTraversabl
       val k = key(elem)
       val v = map.get(k) match {
         case Some(b) => reduce(b, f(elem))
-        case None    => f(elem)
+        case None => f(elem)
       }
       map.put(k, v)
     }
@@ -567,7 +567,7 @@ class TraversableLikeExtensionMethods[A, Repr](private val self: c.GenTraversabl
 
   def distinctBy[B, That](f: A => B)(implicit cbf: CanBuildFrom[Repr, A, That]): That = {
     val builder = cbf()
-    val keys    = collection.mutable.Set.empty[B]
+    val keys = collection.mutable.Set.empty[B]
     for (element <- self) {
       val key = f(element)
       if (!keys.contains(key)) {
@@ -591,8 +591,8 @@ class TrulyTraversableLikeExtensionMethods[El1, Repr1](
 class Tuple2ZippedExtensionMethods[El1, Repr1, El2, Repr2](
     private val self: Tuple2Zipped[El1, Repr1, El2, Repr2]) {
 
-  def lazyZip[El3, Repr3, T3](t3: T3)(implicit w3: T3 => IterableLike[El3, Repr3])
-    : Tuple3Zipped[El1, Repr1, El2, Repr2, El3, Repr3] =
+  def lazyZip[El3, Repr3, T3](t3: T3)(implicit
+  w3: T3 => IterableLike[El3, Repr3]): Tuple3Zipped[El1, Repr1, El2, Repr2, El3, Repr3] =
     new Tuple3Zipped((self.colls._1, self.colls._2, t3))
 }
 
@@ -610,7 +610,7 @@ class ImmutableMapExtensionMethods[K, V](private val self: scala.collection.immu
   def updatedWith[V1 >: V](key: K)(remappingFunction: (Option[V]) => Option[V1]): Map[K, V1] =
     remappingFunction(self.get(key)) match {
       case Some(v) => self.updated(key, v)
-      case None    => self - key
+      case None => self - key
     }
 }
 
@@ -621,7 +621,7 @@ class MutableMapExtensionMethods[K, V](private val self: scala.collection.mutabl
     val updatedEntry = remappingFunction(self.get(key))
     updatedEntry match {
       case Some(v) => self.update(key, v)
-      case None    => self.remove(key)
+      case None => self.remove(key)
     }
     updatedEntry
   }