Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
camc314 merged 1 commit into from
Aug 14, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/oxc_linter/src/rules/eslint/array_callback_return/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}])),
Expand Down
16 changes: 12 additions & 4 deletions crates/oxc_linter/src/rules/eslint/array_callback_return/return_checker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading