FormatTokensRewrite: add createIfRequested()

scalameta · Mar 3, 2024 · a3cdf2e · a3cdf2e
1 parent bc1675f
commit a3cdf2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/FormatTokensRewrite.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/FormatTokensRewrite.scala
@@ -222,6 +222,11 @@ object FormatTokensRewrite {
   private[rewrite] trait RuleFactory {
     def enabled(implicit style: ScalafmtConfig): Boolean
     def create(implicit ftoks: FormatTokens): Rule
+    final def createIfRequested(implicit
+        ftoks: FormatTokens,
+        style: ScalafmtConfig
+    ): Option[Rule] =
+      if (getFactories.contains(this) && enabled) Some(create) else None
   }
 
   private def getFactories(implicit style: ScalafmtConfig): Seq[RuleFactory] =

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala
@@ -213,12 +213,6 @@ class RedundantBraces(implicit val ftoks: FormatTokens)
   ): RedundantBracesSettings =
     style.rewrite.redundantBraces
 
-  private def redundantParensFunc(implicit
-      style: ScalafmtConfig
-  ): Option[Rule] =
-    if (!style.rewrite.rules.contains(RedundantParens)) None
-    else Some(RedundantParens.create)
-
   private def processInterpolation(implicit ft: FormatToken): Boolean = {
     def isIdentifierAtStart(value: String) =
       value.headOption.exists(x => Character.isLetterOrDigit(x) || x == '_')
@@ -450,8 +444,8 @@ class RedundantBraces(implicit val ftoks: FormatTokens)
             case x: Token.LeftParen =>
               ftoks.matchingOpt(x) match {
                 case Some(y) if y ne stat.tokens.last =>
-                  redundantParensFunc.exists { parensRule =>
-                    parensRule.onToken(ftoks(x, -1), session, style).exists {
+                  RedundantParens.createIfRequested.exists {
+                    _.onToken(ftoks(x, -1), session, style).exists {
                       _.how eq ReplacementType.Remove
                     }
                   }