Skip to content

fix(linter/switch-case-braces): add support for string including colon on case expression #13687

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
merged 5 commits into from
Sep 20, 2025
Merged

fix(linter/switch-case-braces): add support for string including colon on case expression #13687

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
341aa89
fix(linter/switch-case-braces): add support for string including colo…
Lukinoh Sep 11, 2025
2830da9
fix(linter/switch-case-braces): move regex out of the for loop
Lukinoh Sep 12, 2025
dfa5825
fix(linter/switch-case-braces): move the regex to fix lintgen
Lukinoh Sep 19, 2025
f08261d
fix(linter/switch-case-braces): add non-capturing group to regex
Lukinoh Sep 19, 2025
1288958
refactor(linter/switch-case-braces): remove usage of regex to improve…
Lukinoh Sep 19, 2025
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
26 changes: 24 additions & 2 deletions crates/oxc_linter/src/rules/unicorn/switch_case_braces.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use lazy_regex::Regex;
use oxc_ast::{AstKind, ast::Statement};
use oxc_diagnostics::OxcDiagnostic;
use oxc_macros::declare_oxc_lint;
Expand Down Expand Up @@ -103,6 +104,9 @@ impl Rule for SwitchCaseBraces {
return;
}

let switch_clause_regex =
Regex::new(r#"(?:case|default)\s*(?:`[^`]+`|'[^']+'|"[^"]+"|[^:]*):"#).unwrap();

for case in &switch.cases {
if case.consequent.is_empty() {
continue;
Expand Down Expand Up @@ -142,8 +146,11 @@ impl Rule for SwitchCaseBraces {
};

if self.always_braces && missing_braces {
let colon = u32::try_from(ctx.source_range(case.span).find(':').unwrap()).unwrap();
let span = Span::sized(case.span.start, colon + 1);
let colon_end = u32::try_from(
switch_clause_regex.find(ctx.source_range(case.span)).unwrap().end(),
)
.unwrap();
let span = Span::sized(case.span.start, colon_end);
ctx.diagnostic_with_fix(
switch_case_braces_diagnostic_missing_braces(span),
|fixer| {
Expand Down Expand Up @@ -251,6 +258,21 @@ fn test() {
None,
),
("switch(foo){ case 1: {}; break; }", "switch(foo){ case 1: { {}; break;} }", None),
(
"switch(something) { case `scope:type`: doSomething();}",
"switch(something) { case `scope:type`: { doSomething();}}",
None,
),
(
"switch(something) { case \"scope:type\": doSomething();}",
"switch(something) { case \"scope:type\": { doSomething();}}",
None,
),
(
"switch(something) { case 'scope:type': doSomething();}",
"switch(something) { case 'scope:type': { doSomething();}}",
None,
),
];

Tester::new(SwitchCaseBraces::NAME, SwitchCaseBraces::PLUGIN, pass, fail)
Expand Down
Loading