From 20a99c018fa421f75c6cbf16f49c64dfd9e3e834 Mon Sep 17 00:00:00 2001
From: AshishGhodvinde <ghodvindeashish@gmail.com>
Date: Sat, 5 Sep 2026 23:56:04 +0530
Subject: [PATCH] fix: disable conflicting IfBraceChecker

---
 dev/scalastyle-config.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/scalastyle-config.xml b/dev/scalastyle-config.xml
index 9de6df51ef7..7a15edfb4f2 100644
--- a/dev/scalastyle-config.xml
+++ b/dev/scalastyle-config.xml
@@ -91,7 +91,8 @@ This file is divided into 3 sections:
 
   <check level="error" class="org.scalastyle.scalariform.UppercaseLChecker" enabled="true"></check>
 
-  <check level="error" class="org.scalastyle.scalariform.IfBraceChecker" enabled="true">
+  <!-- Disabled because Scalafmt can wrap brace-less if/else expressions across multiple lines. -->
+  <check level="error" class="org.scalastyle.scalariform.IfBraceChecker" enabled="false">
     <parameters>
       <parameter name="singleLineAllowed"><![CDATA[true]]></parameter>
       <parameter name="doubleLineAllowed"><![CDATA[true]]></parameter>