Update scalafmt-core to 2.4.1 (#1329)

* Update scalafmt-core to 2.4.1 * fmt Co-authored-by: Frank S. Thomas <f.thomas@gmx.de>
scala-steward-org · Feb 16, 2020 · 112b76e · 112b76e
1 parent 5bde1bd
commit 112b76e
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 35 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 2.3.2
+version = 2.4.1
 assumeStandardLibraryStripMargin = true
 align.openParenCallSite = false
 align.openParenDefnSite = false

diff --git a/modules/core/src/main/scala/org/scalasteward/core/edit/UpdateHeuristic.scala b/modules/core/src/main/scala/org/scalasteward/core/edit/UpdateHeuristic.scala
@@ -118,31 +118,32 @@ object UpdateHeuristic {
   val moduleId = UpdateHeuristic(
     name = "moduleId",
     replaceVersion = update =>
-      target => {
-        val groupId = Regex.quote(update.groupId.value)
-        val artifactIds =
-          alternation(update.artifactIds.map(artifactId => Regex.quote(artifactId.name)))
-        val currentVersion = Regex.quote(update.currentVersion)
-        val regex =
-          raw"""(.*)(["|`]$groupId(?:"\s*%+\s*"|:+)$artifactIds(?:"\s*%\s*|:+))("?)($currentVersion)("|`)""".r
-        replaceSomeInAllowedParts(
-          regex,
-          target,
-          match0 => {
-            val precedingCharacters = match0.group(1)
-            val dependency = match0.group(2)
-            val versionPrefix = match0.group(4)
-            val versionSuffix = match0.group(6)
-            if (shouldBeIgnored(precedingCharacters)) None
-            else
-              Some(
-                Regex.quoteReplacement(
-                  s"""$precedingCharacters$dependency$versionPrefix${update.nextVersion}$versionSuffix"""
+      target =>
+        {
+          val groupId = Regex.quote(update.groupId.value)
+          val artifactIds =
+            alternation(update.artifactIds.map(artifactId => Regex.quote(artifactId.name)))
+          val currentVersion = Regex.quote(update.currentVersion)
+          val regex =
+            raw"""(.*)(["|`]$groupId(?:"\s*%+\s*"|:+)$artifactIds(?:"\s*%\s*|:+))("?)($currentVersion)("|`)""".r
+          replaceSomeInAllowedParts(
+            regex,
+            target,
+            match0 => {
+              val precedingCharacters = match0.group(1)
+              val dependency = match0.group(2)
+              val versionPrefix = match0.group(4)
+              val versionSuffix = match0.group(6)
+              if (shouldBeIgnored(precedingCharacters)) None
+              else
+                Some(
+                  Regex.quoteReplacement(
+                    s"""$precedingCharacters$dependency$versionPrefix${update.nextVersion}$versionSuffix"""
+                  )
                 )
-              )
-          }
-        ).someIfChanged
-      } >>= replaceGroupF(update)
+            }
+          ).someIfChanged
+        } >>= replaceGroupF(update)
   )
 
   val strict = UpdateHeuristic(

diff --git a/modules/core/src/main/scala/org/scalasteward/core/io/FileAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/io/FileAlg.scala
@@ -112,9 +112,7 @@ object FileAlg {
             val copyOptions = File.CopyOptions(overwrite = true)
             if (file.exists) Some(file.moveTo(File.newTemporaryFile())(copyOptions)) else None
           }
-        } { _ =>
-          fa
-        } {
+        }(_ => fa) {
           case Some(tmpFile) => F.delay(tmpFile.moveTo(file)).void
           case None          => F.unit
         }

diff --git a/modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala
@@ -81,7 +81,7 @@ final class NurtureAlg[F[_]](
     for {
       repoConfig <- repoConfigAlg.readRepoConfigOrDefault(repo)
       grouped = Update.groupByGroupId(updates)
-      sorted = grouped.sortBy { migrationAlg.findMigrations(_).size }
+      sorted = grouped.sortBy(migrationAlg.findMigrations(_).size)
       _ <- logger.info(util.logger.showUpdates(sorted))
       baseSha1 <- gitAlg.latestSha1(repo, baseBranch)
       _ <- NurtureAlg.processUpdates(

diff --git a/modules/core/src/main/scala/org/scalasteward/core/util/string.scala b/modules/core/src/main/scala/org/scalasteward/core/util/string.scala
@@ -70,7 +70,7 @@ object string {
       replacer: Regex.Match => Option[String]
   ): Change[String] = {
     var changed = false
-    val replacer1 = replacer.andThen(_.map(r => { changed = true; r }))
+    val replacer1 = replacer.andThen(_.map { r => changed = true; r })
     val result = regex.replaceSomeIn(target, replacer1)
     if (changed) Changed(result) else Unchanged(result)
   }

diff --git a/modules/core/src/test/scala/org/scalasteward/core/data/VersionTest.scala b/modules/core/src/test/scala/org/scalasteward/core/data/VersionTest.scala
@@ -187,9 +187,7 @@ class VersionTest
   }
 
   test("Component: round-trip") {
-    forAll { str: String =>
-      Component.render(Component.parse(str)) shouldBe str
-    }
+    forAll { str: String => Component.render(Component.parse(str)) shouldBe str }
   }
 
   test("Component: round-trip example") {

diff --git a/modules/core/src/test/scala/org/scalasteward/core/update/UpdateAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/update/UpdateAlgTest.scala
@@ -25,7 +25,8 @@ class UpdateAlgTest extends AnyFunSuite with Matchers {
   }
 
   test("findUpdate: newer groupId") {
-    val dependency = "org.spire-math" % ArtifactId("kind-projector", "kind-projector_2.12") % "0.9.10"
+    val dependency =
+      "org.spire-math" % ArtifactId("kind-projector", "kind-projector_2.12") % "0.9.10"
     val expected = Update.Single(
       "org.spire-math" % ArtifactId("kind-projector", "kind-projector_2.12") % "0.9.10",
       Nel.of("0.10.0"),

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -28,7 +28,8 @@ object Dependencies {
   val refinedCats = "eu.timepit" %% "refined-cats" % refined.revision
   val refinedScalacheck = "eu.timepit" %% "refined-scalacheck" % refined.revision
   val scalacacheCaffeine = "com.github.cb372" %% "scalacache-caffeine" % "0.28.0"
-  val scalacacheCatsEffect = "com.github.cb372" %% "scalacache-cats-effect" % scalacacheCaffeine.revision
+  val scalacacheCatsEffect =
+    "com.github.cb372" %% "scalacache-cats-effect" % scalacacheCaffeine.revision
   val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.3"
   val scalaTest = "org.scalatest" %% "scalatest" % "3.1.0"
 }