Update scalafmt-core to 3.5.3 (#198)

* Update scalafmt-core to 3.5.3 * Reformat with scalafmt 3.5.3
leobenkel · May 16, 2022 · 2ddb0d2 · 2ddb0d2
1 parent 005138e
commit 2ddb0d2
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.5.2"
+version = "3.5.3"
 
 style = default
 runner.dialect = "scala212"

diff --git a/src/main/scala/com/leobenkel/soteria/Modules/Dependency.scala b/src/main/scala/com/leobenkel/soteria/Modules/Dependency.scala
@@ -93,7 +93,7 @@ case class Dependency(
   def withVersion(version: String): Dependency = this.copy(versions = Set(version))
 
   private def shouldBeTestedForInclusion(m: ModuleID): Boolean =
-    ((m.name.contains("_") || m.crossVersion.isInstanceOf[CrossVersion.Binary]) ||
+    (m.name.contains("_") || m.crossVersion.isInstanceOf[CrossVersion.Binary] ||
     this.nameObj.needDoublePercent || this.scalaVersionsFilter.nonEmpty) && this.shouldDownload
 
   def shouldBeDownloaded(scalaV: ScalaV): Boolean =

diff --git a/src/main/scala/com/leobenkel/soteria/Transformations/CheckVersion.scala b/src/main/scala/com/leobenkel/soteria/Transformations/CheckVersion.scala
@@ -65,7 +65,7 @@ private[Transformations] trait CheckVersion {
       correctVersion:   String,
   ): Seq[String] =
     librariesToCheck
-      .filter(m => (correctModule === m) && m.revision != correctVersion)
+      .filter(m => correctModule === m && m.revision != correctVersion)
       .map { m =>
         val correctModuleToString = m.withRevision(correctVersion).withName(m.name).prettyString
 

diff --git a/src/main/scala/com/leobenkel/soteria/Transformations/TaskDebugModule.scala b/src/main/scala/com/leobenkel/soteria/Transformations/TaskDebugModule.scala
@@ -20,7 +20,7 @@ private[Transformations] trait TaskDebugModule {
     implicit class ParserNoQuote(p: Parser[String]) {
       val ensureNoQuotes: Parser[String] =
         p.map {
-            case n if n.contains('"') => throw new Exception()
+            case n if n.contains('"') => throw new Exception
             case n                    => n
           }
           .failOnException

diff --git a/src/test/scala/com/leobenkel/soteria/Messages/ErrorMessageTest.scala b/src/test/scala/com/leobenkel/soteria/Messages/ErrorMessageTest.scala
@@ -157,7 +157,7 @@ class ErrorMessageTest extends ParentTest {
   test("Test combine empty error") {
     val emptyError = NoError
     val error      = ErrorMessage("error title", "error Message")
-    val allError   = (emptyError ++ NoError) ++ (NoError ++ error)
+    val allError   = emptyError ++ NoError ++ (NoError ++ error)
 
     allError.consume { s =>
       assertEquals(

diff --git a/src/test/scala/com/leobenkel/soteria/Transformations/TaskAllDependenciesTest.scala b/src/test/scala/com/leobenkel/soteria/Transformations/TaskAllDependenciesTest.scala
@@ -47,7 +47,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
   test("test filterLibraries - empty") {
     val inputLib           = Seq()
     val dependencySearched = Dependency("com.org", "artifact")
-    val log                = new LogTest()
+    val log                = new LogTest
     val output             =
       ZTestOnlyTaskAllDependencies.filterLibrariesTest(
         log = log,
@@ -75,7 +75,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
         "com.org2" % "foo"      % "v2.0",
       )
     val dependencySearched = Dependency("com.org", "artifact")
-    val log                = new LogTest()
+    val log                = new LogTest
 
     val output =
       ZTestOnlyTaskAllDependencies.filterLibrariesTest(
@@ -111,7 +111,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
         "org.scala-lang" % "scala"    % "2.12",
       )
     val dependencySearched = Dependency("com.org", "artifact")
-    val log                = new LogTest()
+    val log                = new LogTest
 
     val output =
       ZTestOnlyTaskAllDependencies.filterLibrariesTest(
@@ -143,7 +143,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
   test("test getLibraryFiltered - empty") {
     val packageKnownRiskDependencies: Map[Dependency, Seq[NameOfModule]] = Map()
     val libraries:                    Seq[ModuleID]                      = Seq()
-    val log    = new LogTest()
+    val log    = new LogTest
     val output =
       ZTestOnlyTaskAllDependencies.getLibraryFilteredTest(
         log,
@@ -166,7 +166,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
       Seq(
         "com.org" % "artifact" % "v1.0"
       )
-    val log = new LogTest()
+    val log = new LogTest
     val output =
       ZTestOnlyTaskAllDependencies.getLibraryFilteredTest(
         log,
@@ -181,7 +181,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
   }
 
   test("test removeBadDependencies - remove fully") {
-    val log = new LogTest()
+    val log = new LogTest
     val needToBeReplaced: Seq[Dependency] =
       Seq(
         Dependency("com.org2", "foo"),
@@ -213,7 +213,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
 
   test("test removeBadDependencies - break") {
     val log =
-      new LogTest() {
+      new LogTest {
         override def setSoftError(softError: Boolean): LoggerExtended = {
           test.assert(softError)
           this
@@ -246,7 +246,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
   }
 
   test("test removeBadDependencies - replace") {
-    val log         = new LogTest()
+    val log         = new LogTest
     val replacement = Dependency("com.org2", "baz").withVersion("v3.0")
 
     val needToBeReplaced: Seq[Dependency] =
@@ -286,7 +286,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
   }
 
   test("test excludeBadDependencies - empty") {
-    val log = new LogTest()
+    val log = new LogTest
     val libraryToEdit:    Seq[(ModuleID, Seq[NameOfModule])] = Seq()
     val needToBeReplaced: Seq[Dependency]                    = Seq()
     val output =
@@ -301,7 +301,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
   }
 
   test("test excludeBadDependencies - nothing to do") {
-    val log = new LogTest()
+    val log = new LogTest
     val libraryToEdit:    Seq[(ModuleID, Seq[NameOfModule])] =
       Seq(
         "com.org" % "artifact" % "v1.0" -> Seq()
@@ -320,7 +320,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
   }
 
   test("test excludeBadDependencies - remove entirely") {
-    val log = new LogTest()
+    val log = new LogTest
     val libraryToEdit:    Seq[(ModuleID, Seq[NameOfModule])] =
       Seq(
         "com.org" % "artifact" % "v1.0" ->
@@ -350,7 +350,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
   }
 
   test("test excludeBadDependencies") {
-    val log = new LogTest()
+    val log = new LogTest
     val libraryToEdit:    Seq[(ModuleID, Seq[NameOfModule])] =
       Seq(
         "com.org" % "artifact" % "v1.0" ->
@@ -377,14 +377,14 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
     )
     assert(log.getAllMessages.contains(needToBeReplaced.head.toString))
 
-    assert(output.length == (libraryToEdit.length + needToBeReplaced.length))
+    assert(output.length == libraryToEdit.length + needToBeReplaced.length)
     assert(output.head.prettyString == needToBeReplaced.head.toString)
     assert(output.apply(1).prettyString == libraryToEdit.head._1.prettyString)
   }
 
   test("test execAllDependencies - empty") {
     val log =
-      new LogTest() {
+      new LogTest {
         override def separator(
             level: Level.Value,
             title: String,
@@ -433,7 +433,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
 
   test("test execAllDependencies - with debug - present") {
     val log =
-      new LogTest() {
+      new LogTest {
         override def separator(
             level: Level.Value,
             title: String,
@@ -492,7 +492,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
 
   test("test execAllDependencies - with debug - absent") {
     val log =
-      new LogTest() {
+      new LogTest {
         override def separator(
             level: Level.Value,
             title: String,
@@ -553,7 +553,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
 
   test("test execAllDependencies") {
     val log =
-      new LogTest() {
+      new LogTest {
         override def separator(
             level: Level.Value,
             title: String,
@@ -609,7 +609,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
 
   test("test rewriteLibAndVersionCheck - wrong version") {
     val log =
-      new LogTest() {
+      new LogTest {
         override def separator(
             level: Level.Value,
             title: String,
@@ -674,7 +674,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
 
   test("test rewriteLibAndVersionCheck") {
     val log =
-      new LogTest() {
+      new LogTest {
         override def separator(
             level: Level.Value,
             title: String,
@@ -732,7 +732,7 @@ class TaskAllDependenciesTest extends ParentTest with TaskAllDependencies {
 
   test("test rewriteLibraries") {
     val log =
-      new LogTest() {
+      new LogTest {
         override def separator(
             level: Level.Value,
             title: String,

diff --git a/src/test/scala/com/leobenkel/soteria/Transformations/TaskUpdateTest.scala b/src/test/scala/com/leobenkel/soteria/Transformations/TaskUpdateTest.scala
@@ -71,7 +71,7 @@ class TaskUpdateTest extends ParentTest with TaskUpdate {
     val (goodModules, errors) =
       ZTestOnlyTaskUpdate.checkTooManyVersionsTest(
         log =
-          new LogTest() {
+          new LogTest {
             override def separator(
                 level: Level.Value,
                 title: String,
@@ -100,7 +100,7 @@ class TaskUpdateTest extends ParentTest with TaskUpdate {
     val (goodModules, errors) =
       ZTestOnlyTaskUpdate.checkTooManyVersionsTest(
         log =
-          new LogTest() {
+          new LogTest {
             override def separator(
                 level: Level.Value,
                 title: String,
@@ -155,7 +155,7 @@ class TaskUpdateTest extends ParentTest with TaskUpdate {
 
     ZTestOnlyTaskUpdate.printDebugTest(
       log =
-        new LogTest() {
+        new LogTest {
           override def separator(
               level: Level.Value,
               title: String,

diff --git a/src/test/scala/com/leobenkel/soteria/Utils/ImplicitModuleToStringTest.scala b/src/test/scala/com/leobenkel/soteria/Utils/ImplicitModuleToStringTest.scala
@@ -31,7 +31,7 @@ class ImplicitModuleToStringTest extends ParentTest {
     val m: Seq[ModuleID] = revisions.map(r => org % name % r)
     val header = "this is a header"
     m.prettyString(
-      new LoggerExtended() {
+      new LoggerExtended {
         override def isSoftError: Boolean = test.fail("Should not be called")
 
         override def setSoftError(softError: Boolean): LoggerExtended =
@@ -75,7 +75,7 @@ class ImplicitModuleToStringTest extends ParentTest {
     val m: Seq[Dependency] = revisions.map(r => Dependency(org % name % r))
     val header = "this is a header"
     m.prettyString(
-      new LoggerExtended() {
+      new LoggerExtended {
         override def isSoftError: Boolean = test.fail("Should not be called")
 
         override def setSoftError(softError: Boolean): LoggerExtended =