Run RedundantParens

.scalafmt.conf

@@ -1 +1,2 @@
 project.git = true
+rewrite.rules = [RedundantParens]

repos/akka/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala

@@ -334,7 +334,7 @@ final case class NodeMetrics(address: Address,
     // Average metrics present in both latest and current.
     val updated = for {
       latest ← latestNode.metrics
-      current ← currentNode.metrics if (latest sameAs current)
+      current ← currentNode.metrics if latest sameAs current
     } yield {
       current :+ latest
     }

repos/framework/core/json/src/test/scala/net/liftweb/json/JsonQueryExamples.scala

@@ -55,7 +55,7 @@ object JsonQueryExamples extends Specification {
   "List of IPs in cluster2" in {
     val ips = for {
       cluster @ JObject(x) <- json \ "data_center"
-      if (x contains JField("name", JString("cluster2")))
+      if x contains JField("name", JString("cluster2"))
       JField("ip", JString(ip)) <- (cluster \\ "ip").obj
     } yield {
       ip

repos/goose/src/main/scala/com/gravity/goose/cleaners/DocumentCleaner.scala

@@ -69,7 +69,7 @@ trait DocumentCleaner {
 
     for {
       node <- ems
-      images: Elements = node.getElementsByTag("img") if (images.size == 0)
+      images: Elements = node.getElementsByTag("img") if images.size == 0
     } {
       val tn: TextNode = new TextNode(node.text, doc.baseUri)
       node.replaceWith(tn)

repos/intellij-scala/src/org/jetbrains/plugins/scala/annotator/modifiers/ModifierChecker.scala

@@ -55,10 +55,10 @@ private[annotator] object ModifierChecker {
         ("private", "protected"),
         if (withPrivate) ("private", "override") else ("", "")
       )
-      for ((bad1, bad2) <- illegalCombinations if (bad1 == text &&
+      for ((bad1, bad2) <- illegalCombinations if bad1 == text &&
              owner.hasModifierPropertyScala(bad2)) ||
-             (bad2 == text &&
-               owner.hasModifierPropertyScala(bad1))) {
+      (bad2 == text &&
+        owner.hasModifierPropertyScala(bad1)) {
         proccessError(
           ScalaBundle.message("illegal.modifiers.combination", bad1, bad2),
           element,

repos/kafka/core/src/main/scala/kafka/controller/PartitionStateMachine.scala

@@ -125,8 +125,8 @@ class PartitionStateMachine(controller: KafkaController) extends Logging {
       // try to move all partitions in NewPartition or OfflinePartition state to OnlinePartition state except partitions
       // that belong to topics to be deleted
       for ((topicAndPartition, partitionState) <- partitionState
-           if (!controller.deleteTopicManager.isTopicQueuedUpForDeletion(
-             topicAndPartition.topic))) {
+           if !controller.deleteTopicManager.isTopicQueuedUpForDeletion(
+             topicAndPartition.topic)) {
         if (partitionState.equals(OfflinePartition) ||
             partitionState.equals(NewPartition))
           handleStateChange(topicAndPartition.topic,

repos/lila/modules/setup/src/main/ValidFen.scala

@@ -9,7 +9,7 @@ object ValidFen {
   def apply(strict: Boolean)(fen: String): Option[ValidFen] =
     for {
       parsed ← chess.format.Forsyth <<< fen
-      if (parsed.situation playable strict)
+      if parsed.situation playable strict
       validated = chess.format.Forsyth >> parsed
     } yield ValidFen(validated, parsed.situation)
 }

repos/sbt/main/src/main/scala/sbt/EvaluateTask.scala

@@ -419,7 +419,7 @@ object EvaluateTask {
       }
     }
 
-    for ((key, msg, ex) <- keyed if (msg.isDefined || ex.isDefined)) {
+    for ((key, msg, ex) <- keyed if msg.isDefined || ex.isDefined) {
       val msgString =
         (msg.toList ++ ex.toList.map(ErrorHandling.reducedToString))
           .mkString("\n\t")

repos/scala/src/compiler/scala/tools/nsc/transform/patmat/MatchAnalysis.scala

@@ -671,7 +671,7 @@ trait MatchAnalysis extends MatchApproximation {
         //         with Nil and List().
         val result = mutable.Buffer[CounterExample]()
         for (example <- examples
-             if (!result.exists(example coveredBy _))) result += example
+             if !result.exists(example coveredBy _)) result += example
         result.toList
       }
     }

repos/scala/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala

@@ -855,8 +855,8 @@ abstract class RefChecks
           }
 
           // Check the remainder for invalid absoverride.
-          for (member <- rest; if (member.isAbstractOverride &&
-                 member.isIncompleteIn(clazz))) {
+          for (member <- rest; if member.isAbstractOverride &&
+                 member.isIncompleteIn(clazz)) {
             val other = member.superSymbolIn(clazz)
             val explanation =
               if (other != NoSymbol)

repos/scala/test/files/run/reify_for1.scala

@@ -4,7 +4,7 @@ import scala.tools.reflect.Eval
 object Test extends App {
   reify {
     val sumOfSquares1 =
-      (for (i <- 1 to 100; if (i % 3 == 0)) yield Math.pow(i, 2)).sum
+      (for (i <- 1 to 100; if i % 3 == 0) yield Math.pow(i, 2)).sum
     val sumOfSquares2 = (1 to 100).filter(_ % 3 == 0).map(Math.pow(_, 2)).sum
     assert(sumOfSquares1 == sumOfSquares2)
   }.eval

repos/scala/test/junit/scala/concurrent/impl/DefaultPromiseTest.scala

@@ -59,7 +59,7 @@ class DefaultPromiseTest {
     private def promiseChain(p: PromiseId): Option[(ChainId, Chain)] = {
       val found: Iterable[(ChainId, Chain)] = for ((cid, c) <- chains;
                                                    p0 <- c.promises;
-                                                   if (p0 == p))
+                                                   if p0 == p)
         yield ((cid, c))
       found.toList match {
         case Nil => None

repos/scala/test/junit/scala/math/BigDecimalTest.scala

@@ -225,7 +225,7 @@ class BigDecimalTest {
       BigDecimal.exact(0.1f),
       BigDecimal.decimal((0.1f).toDouble)
     )
-    for (a <- different; b <- different if (a ne b))
+    for (a <- different; b <- different if a ne b)
       assert(a != b,
              "BigDecimal representations of Double mistakenly conflated")
   }

repos/scalafx/scalafx/src/test/scala/scalafx/collections/ObservableMapSpec.scala

@@ -230,7 +230,7 @@ class ObservableMapSpec[K, V]
     //      The `for` loop implements operation equivalent to `map.retain`
     //      without throwing ConcurrentModificationException.
     //    compareInstances(map.retain((i, str) => i % 2 == 0), map, true)
-    for (k <- map.keys.toArray if (k % 2 != 0)) { map.remove(k) }
+    for (k <- map.keys.toArray if k % 2 != 0) { map.remove(k) }
     map should equal(
       ObservableMap((10 to 20).filter(_ % 2 == 0).map(i => (i, i.toString))))
     removedEntries.toList.sortWith(_._1 < _._1) should equal(

repos/scalding/scalding-core/src/test/scala/com/twitter/scalding/mathematics/TypedSimilarityTest.scala

@@ -95,8 +95,8 @@ class TypedSimilarityTest extends WordSpec with Matchers {
       seq =>
         seq.map { case (from, to) => (from, 1.0) }.toMap
     }
-    for ((k1, v1) <- matrix if (k1 % 2 == 0);
-         (k2, v2) <- matrix if (k2 % 2 == 1))
+    for ((k1, v1) <- matrix if k1 % 2 == 0;
+         (k2, v2) <- matrix if k2 % 2 == 1)
       yield
         ((k1, k2) -> (dot(v1, v2) / scala.math.sqrt(
           dot(v1, v1) * dot(v2, v2))))
@@ -108,8 +108,8 @@ class TypedSimilarityTest extends WordSpec with Matchers {
       seq =>
         seq.map { case (from, to, weight) => (from, weight) }.toMap
     }
-    for ((k1, v1) <- matrix if (k1 % 2 == 0);
-         (k2, v2) <- matrix if (k2 % 2 == 1))
+    for ((k1, v1) <- matrix if k1 % 2 == 0;
+         (k2, v2) <- matrix if k2 % 2 == 1)
       yield
         ((k1, k2) -> (dot(v1, v2) / scala.math.sqrt(
           dot(v1, v1) * dot(v2, v2))))

repos/slick/slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/JoinTest.scala

@@ -395,7 +395,7 @@ class JoinTest extends AsyncTest[RelationalTestDB] {
     lazy val bs = TableQuery[B]
 
     val q1 = for {
-      (a, b) <- as joinLeft bs on (_.id.? === _.id) if (b.isEmpty)
+      (a, b) <- as joinLeft bs on (_.id.? === _.id) if b.isEmpty
     } yield (a.id)
     val q2 =
       bs.joinLeft(as).on(_.id === _.id).filter(_._2.isEmpty).map(_._1.id)

repos/slick/slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/MainTest.scala

@@ -112,9 +112,9 @@ class MainTest extends AsyncTest[JdbcTestDB] { mainTest =>
     }.flatMap { _ =>
       val q4 = for {
         u <- users
-        o <- u.orders if (o.orderID === (for {
+        o <- u.orders if o.orderID === (for {
           o2 <- orders filter (o.userID === _.userID)
-        } yield o2.orderID).max)
+        } yield o2.orderID).max
       } yield (u.first, o.orderID)
       q4.result.statements.toSeq.length.should(_ >= 1)
 

repos/spark/core/src/main/scala/org/apache/spark/SparkConf.scala

@@ -116,7 +116,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
 
   /** Set JAR files to distribute to the cluster. */
   def setJars(jars: Seq[String]): SparkConf = {
-    for (jar <- jars if (jar == null))
+    for (jar <- jars if jar == null)
       logWarning("null jar passed to SparkContext constructor")
     set("spark.jars", jars.filter(_ != null).mkString(","))
   }

repos/spark/core/src/main/scala/org/apache/spark/metrics/MetricsConfig.scala

@@ -64,8 +64,8 @@ private[spark] class MetricsConfig(conf: SparkConf) extends Logging {
     propertyCategories = subProperties(properties, INSTANCE_REGEX)
     if (propertyCategories.contains(DEFAULT_PREFIX)) {
       val defaultProperty = propertyCategories(DEFAULT_PREFIX).asScala
-      for ((inst, prop) <- propertyCategories if (inst != DEFAULT_PREFIX);
-           (k, v) <- defaultProperty if (prop.get(k) == null)) {
+      for ((inst, prop) <- propertyCategories if inst != DEFAULT_PREFIX;
+           (k, v) <- defaultProperty if prop.get(k) == null) {
         prop.put(k, v)
       }
     }

repos/spark/core/src/main/scala/org/apache/spark/rdd/CoalescedRDD.scala

@@ -350,7 +350,7 @@ private class PartitionCoalescer(maxPartitions: Int,
         }
       }
     } else {
-      for (p <- prev.partitions if (!initialHash.contains(p))) {
+      for (p <- prev.partitions if !initialHash.contains(p)) {
         // throw every partition into group
         pickBin(p).arr += p
       }

repos/spire/tests/src/test/scala/spire/math/AlgebraicTest.scala

@@ -203,7 +203,7 @@ class AlgebraicTest extends SpireProperties {
   def genRational: Gen[Rational] =
     for {
       n <- genBigInt
-      d <- genBigInt if (d.signum != 0)
+      d <- genBigInt if d.signum != 0
     } yield Rational(n, d)
 
   def genRationalPoly: Gen[Polynomial[Rational]] =
@@ -284,7 +284,7 @@ class AlgebraicTest extends SpireProperties {
       for {
         RationalAlgebraic(lhsA, lhsQ) <- genRationalAlgebraic(depth + 1)
         RationalAlgebraic(rhsA, rhsQ) <- genRationalAlgebraic(depth + 1)
-        if (rhsQ.signum != 0)
+        if rhsQ.signum != 0
       } yield RationalAlgebraic(lhsA / rhsA, lhsQ / rhsQ)
 
     def genNeg(depth: Int): Gen[RationalAlgebraic] =

repos/util/util-app/src/main/scala/com/twitter/app/Flag.scala

@@ -976,7 +976,7 @@ private object GlobalFlag {
     // Search for Scala objects annotated with GlobalFlagVisible:
     // Since Scala object classnames end with $, filter by name first
     // before attempting to load the class.
-    for (info <- ClassPath.browse(loader) if (info.name endsWith "$")) try {
+    for (info <- ClassPath.browse(loader) if info.name endsWith "$") try {
       val cls = info.load()
       if (cls.isAnnotationPresent(markerClass)) {
         get(info.name.dropRight(1)) match {