fix: AND/OR newline behavior within IF conditions

- Add context tracking to detect when inside IF conditions
- Skip newlines for AND/OR tokens within IF conditions while preserving
  newline behavior for AND/OR in WHERE clauses and other contexts
- This improves readability of formatted SQL with complex IF statements

Author: bendavies

src/SqlFormatter.php

@@ -66,6 +66,7 @@ public function format(string $string, string $indentString = '  '): string
         $inlineCount           = 0;
         $inlineIndented        = false;
         $clauseLimit           = false;
+        $inIfCondition         = false;
 
         $appendNewLineIfNotAddedFx  = static function () use (&$addedNewline, &$return, $tab, &$indentLevel): void {
             // Add a newline if not already added
@@ -301,8 +302,8 @@ public function format(string $string, string $indentString = '  '): string
                     $newline             = true;
                     $increaseBlockIndent = true;
                 }
-            } elseif (in_array($tokenValueUpper, ['WHEN', 'THEN', 'ELSE', 'ELSEIF', 'END'], true)) {
-                if ($tokenValueUpper !== 'THEN') {
+            } elseif (in_array($tokenValueUpper, ['IF', 'WHEN', 'THEN', 'ELSE', 'ELSEIF', 'END'], true)) {
+                if ($tokenValueUpper !== 'THEN' && $tokenValueUpper !== 'IF') {
                     $decreaseIndentationLevelFx();
 
                     if ($prevNotWhitespaceToken !== null && strtoupper($prevNotWhitespaceToken->value()) !== 'CASE') {
@@ -314,6 +315,20 @@ public function format(string $string, string $indentString = '  '): string
                     $newline             = true;
                     $increaseBlockIndent = true;
                 }
+
+                // Track IF condition context only for IF/ELSEIF that are part of conditional blocks
+                // (not for "IF()" function calls)
+                if ($tokenValueUpper === 'IF' || $tokenValueUpper === 'ELSEIF') {
+                    // Check if this IF is part of a conditional block by looking at the next token
+                    $nextToken = $cursor->subCursor()->next(Token::TOKEN_TYPE_WHITESPACE);
+                    if (
+                        $nextToken !== null && $nextToken->value() !== '('
+                    ) {
+                        $inIfCondition = true;
+                    }
+                } elseif ($tokenValueUpper === 'THEN' || $tokenValueUpper === 'ELSE' || $tokenValueUpper === 'END') {
+                    $inIfCondition = false;
+                }
             } elseif (
                 $clauseLimit &&
                 $token->value() !== ',' &&
@@ -332,9 +347,12 @@ public function format(string $string, string $indentString = '  '): string
                     $newline = true;
                 }
             } elseif ($token->isOfType(Token::TOKEN_TYPE_RESERVED_NEWLINE)) {
-                // Newline reserved words start a new line
+                // Newline reserved words start a new line, except for AND/OR within IF conditions
 
-                $appendNewLineIfNotAddedFx();
+                // Skip newlines for AND/OR when inside IF condition
+                if (! $inIfCondition || ! in_array($tokenValueUpper, ['AND', 'OR'], true)) {
+                    $appendNewLineIfNotAddedFx();
+                }
 
                 if ($token->hasExtraWhitespace()) {
                     $highlighted = preg_replace('/\s+/', ' ', $highlighted);

tests/SqlFormatterTest.php

@@ -175,5 +175,4 @@ public static function highlightData(): Generator
     {
         return self::fileDataProvider('highlight.html');
     }
-
 }