[flake8-simplify] Stabilize further simplification to binary expressions in autofix for if-else-block-instead-of-if-exp (SIM108)

crates/ruff_linter/src/preview.rs

@@ -73,11 +73,6 @@ pub(crate) const fn is_only_add_return_none_at_end_enabled(settings: &LinterSett
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/12796
-pub(crate) const fn is_simplify_ternary_to_binary_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/16719
 pub(crate) const fn is_fix_manual_dict_comprehension_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()

crates/ruff_linter/src/rules/flake8_simplify/mod.rs

@@ -58,7 +58,6 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::IfElseBlockInsteadOfIfExp, Path::new("SIM108.py"))]
     #[test_case(Rule::MultipleWithStatements, Path::new("SIM117.py"))]
     fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(

crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs

@@ -7,13 +7,14 @@ use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
 use crate::fix::edits::fits;
-use crate::preview::is_simplify_ternary_to_binary_enabled;
 use crate::{Edit, Fix, FixAvailability, Violation};
 
 /// ## What it does
-/// Check for `if`-`else`-blocks that can be replaced with a ternary operator.
-/// Moreover, in [preview], check if these ternary expressions can be
-/// further simplified to binary expressions.
+/// Check for `if`-`else`-blocks that can be replaced with a ternary
+/// or binary operator.
+///
+/// The lint is suppressed if the suggested replacement would exceed
+/// the maximum line length configured in [pycodestyle.max-line-length].
 ///
 /// ## Why is this bad?
 /// `if`-`else`-blocks that assign a value to a variable in both branches can
@@ -33,7 +34,7 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// bar = x if foo else y
 /// ```
 ///
-/// Or, in [preview]:
+/// Or:
 ///
 /// ```python
 /// if cond:
@@ -57,8 +58,8 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: Conditional expressions](https://docs.python.org/3/reference/expressions.html#conditional-expressions)
 ///
-/// [preview]: https://docs.astral.sh/ruff/preview/
 /// [code coverage]: https://github.com/nedbat/coveragepy/issues/509
+/// [pycodestyle.max-line-length]: https://docs.astral.sh/ruff/settings/#lint_pycodestyle_max-line-length
 #[derive(ViolationMetadata)]
 pub(crate) struct IfElseBlockInsteadOfIfExp {
     /// The ternary or binary expression to replace the `if`-`else`-block.
@@ -183,24 +184,20 @@ pub(crate) fn if_else_block_instead_of_if_exp(checker: &Checker, stmt_if: &ast::
     //
     // The match statement below implements the following
     // logic:
-    //     - If `test == body_value` and preview enabled, replace with `target_var = test or else_value`
-    //     - If `test == not body_value` and preview enabled, replace with `target_var = body_value and else_value`
-    //     - If `not test == body_value` and preview enabled, replace with `target_var = body_value and else_value`
+    //     - If `test == body_value`, replace with `target_var = test or else_value`
+    //     - If `test == not body_value`, replace with `target_var = body_value and else_value`
+    //     - If `not test == body_value`, replace with `target_var = body_value and else_value`
     //     - Otherwise, replace with `target_var = body_value if test else else_value`
-    let (contents, assignment_kind) = match (
-        is_simplify_ternary_to_binary_enabled(checker.settings),
-        test,
-        body_value,
-    ) {
-        (true, test_node, body_node)
+    let (contents, assignment_kind) = match (test, body_value) {
+        (test_node, body_node)
             if ComparableExpr::from(test_node) == ComparableExpr::from(body_node)
                 && !contains_effect(test_node, |id| checker.semantic().has_builtin_binding(id)) =>
         {
             let target_var = &body_target;
             let binary = assignment_binary_or(target_var, body_value, else_value);
             (checker.generator().stmt(&binary), AssignmentKind::Binary)
         }
-        (true, test_node, body_node)
+        (test_node, body_node)
             if (test_node.as_unary_op_expr().is_some_and(|op_expr| {
                 op_expr.op.is_not()
                     && ComparableExpr::from(&op_expr.operand) == ComparableExpr::from(body_node)

crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM108_SIM108.py.snap

@@ -118,7 +118,7 @@ SIM108.py:117:1: SIM108 Use ternary operator `x = 3 if True else 5` instead of `
     |
     = help: Replace `if`-`else`-block with `x = 3 if True else 5`
 
-SIM108.py:141:1: SIM108 [*] Use ternary operator `z = cond if cond else other_cond` instead of `if`-`else`-block
+SIM108.py:141:1: SIM108 [*] Use binary operator `z = cond or other_cond` instead of `if`-`else`-block
     |
 139 |   # SIM108 - should suggest
 140 |   # z = cond or other_cond
@@ -130,7 +130,7 @@ SIM108.py:141:1: SIM108 [*] Use ternary operator `z = cond if cond else other_co
 145 |
 146 |   # SIM108 - should suggest
     |
-    = help: Replace `if`-`else`-block with `z = cond if cond else other_cond`
+    = help: Replace `if`-`else`-block with `z = cond or other_cond`
 
 ℹ Unsafe fix
 138 138 | 
@@ -140,12 +140,12 @@ SIM108.py:141:1: SIM108 [*] Use ternary operator `z = cond if cond else other_co
 142     |-    z = cond 
 143     |-else:
 144     |-    z = other_cond
-    141 |+z = cond if cond else other_cond
+    141 |+z = cond or other_cond
 145 142 | 
 146 143 | # SIM108 - should suggest
 147 144 | # z = cond and other_cond
 
-SIM108.py:148:1: SIM108 [*] Use ternary operator `z = cond if not cond else other_cond` instead of `if`-`else`-block
+SIM108.py:148:1: SIM108 [*] Use binary operator `z = cond and other_cond` instead of `if`-`else`-block
     |
 146 |   # SIM108 - should suggest
 147 |   # z = cond and other_cond
@@ -157,7 +157,7 @@ SIM108.py:148:1: SIM108 [*] Use ternary operator `z = cond if not cond else othe
 152 |
 153 |   # SIM108 - should suggest
     |
-    = help: Replace `if`-`else`-block with `z = cond if not cond else other_cond`
+    = help: Replace `if`-`else`-block with `z = cond and other_cond`
 
 ℹ Unsafe fix
 145 145 | 
@@ -167,12 +167,12 @@ SIM108.py:148:1: SIM108 [*] Use ternary operator `z = cond if not cond else othe
 149     |-    z = cond
 150     |-else:
 151     |-    z = other_cond
-    148 |+z = cond if not cond else other_cond
+    148 |+z = cond and other_cond
 152 149 | 
 153 150 | # SIM108 - should suggest
 154 151 | # z = not cond and other_cond
 
-SIM108.py:155:1: SIM108 [*] Use ternary operator `z = not cond if cond else other_cond` instead of `if`-`else`-block
+SIM108.py:155:1: SIM108 [*] Use binary operator `z = not cond and other_cond` instead of `if`-`else`-block
     |
 153 |   # SIM108 - should suggest
 154 |   # z = not cond and other_cond
@@ -184,7 +184,7 @@ SIM108.py:155:1: SIM108 [*] Use ternary operator `z = not cond if cond else othe
 159 |
 160 |   # SIM108 does not suggest
     |
-    = help: Replace `if`-`else`-block with `z = not cond if cond else other_cond`
+    = help: Replace `if`-`else`-block with `z = not cond and other_cond`
 
 ℹ Unsafe fix
 152 152 | 
@@ -194,7 +194,7 @@ SIM108.py:155:1: SIM108 [*] Use ternary operator `z = not cond if cond else othe
 156     |-    z = not cond
 157     |-else:
 158     |-    z = other_cond
-    155 |+z = not cond if cond else other_cond
+    155 |+z = not cond and other_cond
 159 156 | 
 160 157 | # SIM108 does not suggest
 161 158 | # a binary option in these cases,