Skip to content

fix(linter): parse regex inside new RegExp() with parentheses #13448

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
graphite-app merged 1 commit into from
Sep 2, 2025
Merged

fix(linter): parse regex inside new RegExp() with parentheses #13448

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
5 changes: 5 additions & 0 deletions crates/oxc_linter/src/rules/eslint/no_control_regex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,11 @@ mod tests {
// globalThis
"var regex = new globalThis.RegExp('\\x1f\\x1e')",
"var regex = globalThis.RegExp('\\x1f')",
// inner expressions (parentheses and type expressions)
"RegExp(('\\x1f'))",
"new RegExp(('\\x1f'))",
"new RegExp((('\\x1f')))",
"new RegExp('\\x1f' as string)",
],
)
.test_and_snapshot();
Expand Down
Binary file modified crates/oxc_linter/src/snapshots/eslint_no_control_regex.snap
View file
Open in desktop
Binary file not shown.
61 changes: 26 additions & 35 deletions crates/oxc_linter/src/utils/regex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,45 +20,36 @@ where
}
}
AstKind::NewExpression(expr) if is_regexp_callee(&expr.callee, ctx) => {
// note: improvements required for strings used via identifier references
// Missing or non-string arguments will be runtime errors, but are not covered by this rule.
match (&expr.arguments.first(), &expr.arguments.get(1)) {
(Some(Argument::StringLiteral(pattern)), Some(Argument::StringLiteral(flags))) => {
let allocator = Allocator::default();
if let Some(pat) = parse_regex(&allocator, pattern.span, Some(flags.span), ctx)
{
cb(&pat, pattern.span);
}
}
(Some(Argument::StringLiteral(pattern)), _) => {
let allocator = Allocator::default();
if let Some(pat) = parse_regex(&allocator, pattern.span, None, ctx) {
cb(&pat, pattern.span);
}
}
_ => {}
}
run_on_arguments(expr.arguments.first(), expr.arguments.get(1), ctx, cb);
}

// RegExp()
AstKind::CallExpression(expr) if is_regexp_callee(&expr.callee, ctx) => {
// note: improvements required for strings used via identifier references
// Missing or non-string arguments will be runtime errors, but are not covered by this rule.
match (&expr.arguments.first(), &expr.arguments.get(1)) {
(Some(Argument::StringLiteral(pattern)), Some(Argument::StringLiteral(flags))) => {
let allocator = Allocator::default();
if let Some(pat) = parse_regex(&allocator, pattern.span, Some(flags.span), ctx)
{
cb(&pat, pattern.span);
}
}
(Some(Argument::StringLiteral(pattern)), _) => {
let allocator = Allocator::default();
if let Some(pat) = parse_regex(&allocator, pattern.span, None, ctx) {
cb(&pat, pattern.span);
}
}
_ => {}
run_on_arguments(expr.arguments.first(), expr.arguments.get(1), ctx, cb);
}
_ => {}
}
}

fn run_on_arguments<M>(arg1: Option<&Argument>, arg2: Option<&Argument>, ctx: &LintContext, cb: M)
where
M: FnOnce(&Pattern<'_>, Span),
{
let arg1 = arg1.map(|arg| arg.to_expression().get_inner_expression());
let arg2 = arg2.map(|arg| arg.to_expression().get_inner_expression());
// note: improvements required for strings used via identifier references
// Missing or non-string arguments will be runtime errors, but are not covered by this rule.
match (&arg1, &arg2) {
(Some(Expression::StringLiteral(pattern)), Some(Expression::StringLiteral(flags))) => {
let allocator = Allocator::default();
if let Some(pat) = parse_regex(&allocator, pattern.span, Some(flags.span), ctx) {
cb(&pat, pattern.span);
}
}
(Some(Expression::StringLiteral(pattern)), _) => {
let allocator = Allocator::default();
if let Some(pat) = parse_regex(&allocator, pattern.span, None, ctx) {
cb(&pat, pattern.span);
}
}
_ => {}
Expand Down
Loading