fix(linter/array-callback-return): fix handling of default case in switch statements for array-callback-return rule (#13081)

lambda47 · web-flow · commit 618ee876a9d1 · 2025-08-14T16:48:01.000+01:00
fix handling of default case in switch statements for array-callback-return rule - fixes(#13075) - Consider cases following the default case in switch statements
diff --git a/crates/oxc_linter/src/rules/eslint/array_callback_return/mod.rs b/crates/oxc_linter/src/rules/eslint/array_callback_return/mod.rs
@@ -311,6 +311,7 @@ fn test() {
             None,
         ),
         ("foo.every(function() { try { bar(); } finally { return true; } })", None),
+        ("foo.every(function() { switch (a) { default: case0: return true; } })", None),
         (
             "Array.from(x, function() { return; })",
             Some(serde_json::json!([{"allowImplicit": true}])),
diff --git a/crates/oxc_linter/src/rules/eslint/array_callback_return/return_checker.rs b/crates/oxc_linter/src/rules/eslint/array_callback_return/return_checker.rs
@@ -156,17 +156,25 @@ pub fn check_statement(statement: &Statement) -> StatementReturnStatus {
         // 2. There is a default case that returns
         Statement::SwitchStatement(stmt) => {
             let mut case_statuses = vec![];
+            // The default case maybe is not the last case and fallthrough
+            let mut default_case_fallthrough_continue = false;
             let mut default_case_status = StatementReturnStatus::NotReturn;
 
             let mut current_case_status = StatementReturnStatus::NotReturn;
             for case in &stmt.cases {
                 let branch_terminated = check_switch_case(case, &mut current_case_status);
-
                 if case.is_default_case() {
-                    default_case_status = current_case_status;
-                    // Cases below the default case are not considered.
-                    break;
+                    if branch_terminated {
+                        default_case_status = current_case_status;
+                        // Cases below the default case are not considered.
+                        break;
+                    }
+                    default_case_fallthrough_continue = true;
                 } else if branch_terminated {
+                    if default_case_fallthrough_continue {
+                        default_case_status = current_case_status;
+                        break;
+                    }
                     case_statuses.push(current_case_status);
                     current_case_status = StatementReturnStatus::NotReturn;
                 } // Falls through to next case, accumulating lattice

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,7 @@ fn test() {`
`311`	`311`	`None,`
`312`	`312`	`),`
`313`	`313`	`("foo.every(function() { try { bar(); } finally { return true; } })", None),`
	`314`	`+ ("foo.every(function() { switch (a) { default: case0: return true; } })", None),`
`314`	`315`	`(`
`315`	`316`	`"Array.from(x, function() { return; })",`
`316`	`317`	`Some(serde_json::json!([{"allowImplicit": true}])),`