Skip to content

refactor(linter): remove nested match statements in no-restricted-imports #10975

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
May 12, 2025
Merged

refactor(linter): remove nested match statements in no-restricted-imports #10975

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
68 changes: 32 additions & 36 deletions crates/oxc_linter/src/rules/eslint/no_restricted_imports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,47 +1276,43 @@ fn get_diagnostic_from_import_name_result_pattern(
diagnostic_pattern(span, pattern.message.clone(), source)
}
ImportNameResult::DefaultDisallowed => {
let diagnostic = match &pattern.import_names {
Some(import_names) => diagnostic_pattern_and_everything(
if let Some(import_names) = &pattern.import_names {
return diagnostic_pattern_and_everything(
span,
pattern.message.clone(),
import_names.join(", ").as_str(),
source,
),
_ => match &pattern.import_name_pattern {
Some(import_name_patterns) => {
diagnostic_pattern_and_everything_with_regex_import_name(
span,
pattern.message.clone(),
import_name_patterns,
source,
)
}
_ => match &pattern.allow_import_name_pattern {
Some(allow_import_name_pattern) => {
diagnostic_everything_with_allowed_import_name_pattern(
span,
pattern.message.clone(),
source,
allow_import_name_pattern.as_str(),
)
}
_ => match &pattern.allow_import_names {
Some(allowed_import_names) => {
diagnostic_everything_with_allowed_import_name(
span,
pattern.message.clone(),
source,
allowed_import_names.join(", ").as_str(),
)
}
_ => diagnostic_pattern(span, pattern.message.clone(), source),
},
},
},
};
);
}

if let Some(import_name_patterns) = &pattern.import_name_pattern {
return diagnostic_pattern_and_everything_with_regex_import_name(
span,
pattern.message.clone(),
import_name_patterns,
source,
);
}

diagnostic
if let Some(allow_import_name_pattern) = &pattern.allow_import_name_pattern {
return diagnostic_everything_with_allowed_import_name_pattern(
span,
pattern.message.clone(),
source,
allow_import_name_pattern.as_str(),
);
}

if let Some(allowed_import_names) = &pattern.allow_import_names {
return diagnostic_everything_with_allowed_import_name(
span,
pattern.message.clone(),
source,
allowed_import_names.join(", ").as_str(),
);
}

diagnostic_pattern(span, pattern.message.clone(), source)
}
ImportNameResult::NameDisallowed(name_span) => match &pattern.allow_import_names {
Some(allow_import_names) => diagnostic_allowed_import_name(
Expand Down
Loading