FormatOps: simplify logic to skip infix indent

scalameta · Dec 27, 2024 · 037d876 · 037d876
1 parent c5d0083
commit 037d876
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
@@ -570,23 +570,15 @@ class FormatOps(
         case _ => false
       }
       val cfg = style.indent.infix
-      val allowNoIndent = cfg.exemptScope match {
+      def allowNoIndent = cfg.exemptScope match {
         case IndentOperator.Exempt.all => true
         case IndentOperator.Exempt.oldTopLevel => isOldTopLevel(getChild)
         case IndentOperator.Exempt.aloneEnclosed => isAloneEnclosed(getChild)
         case IndentOperator.Exempt.aloneArgOrBody => isAloneArgOrBody(getChild)
       }
-      def isInfixTopLevelMatch(op: String, noindent: Boolean): Boolean =
-        noindent == cfg.noindent(op) && noindent == allowNoIndent
       if (cfg.assignmentOnly) isAfterAssignmentOp(false)
       else if (beforeLhs) assignBodyExpire.isEmpty
-      else if (
-        !app.singleArg.exists(_.isAny[Term.Block, Term.NewAnonymous]) &&
-        isInfixTopLevelMatch(ft.meta.left.text, false)
-      ) false
-      else if (isInfixTopLevelMatch(app.op.value, true)) true
-      else if (app.is[Pat] && isChildOfCaseClause(app)) true
-      else false
+      else app.is[Pat] || allowNoIndent && cfg.noindent(app.op.value)
     }
 
     private val fullIndent: Indent = assignBodyExpire match {