Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 43 additions & 0 deletions crates/oxc_linter/src/config/config_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ impl ConfigStoreBuilder {
self.upsert_where(severity, |r| r.category() == *category);
}
LintFilterKind::Rule(plugin, rule) => {
let (plugin, rule) = super::rules::unalias_plugin_name(plugin, rule);
self.upsert_where(severity, |r| r.plugin_name() == plugin && r.name() == rule);
}
LintFilterKind::Generic(name) => self.upsert_where(severity, |r| r.name() == name),
Expand All @@ -317,6 +318,7 @@ impl ConfigStoreBuilder {
self.rules.retain(|rule, _| rule.category() != *category);
}
LintFilterKind::Rule(plugin, rule) => {
let (plugin, rule) = super::rules::unalias_plugin_name(plugin, rule);
self.rules.retain(|r, _| r.plugin_name() != plugin || r.name() != rule);
}
LintFilterKind::Generic(name) => self.rules.retain(|rule, _| rule.name() != name),
Expand Down Expand Up @@ -857,6 +859,47 @@ mod test {
assert_eq!(expected_plugins, builder.plugins());
}

#[test]
fn test_cli_rule_aliases() {
let builder = ConfigStoreBuilder::default().and_builtin_plugins(LintPlugins::REACT, true);

// Assert rule doesn't exist by default
assert_eq!(
builder
.rules
.iter()
.find(|(r, _)| r.plugin_name() == "react" && r.name() == "exhaustive-deps"),
None
);

let builder = builder.with_filter(
&LintFilter::new(AllowWarnDeny::Deny, "react-hooks/exhaustive-deps").unwrap(),
);

let (rule, sev) = builder
.rules
.iter()
.find(|(r, _)| r.plugin_name() == "react" && r.name() == "exhaustive-deps")
.expect("react/exhaustive-deps should be configured to Deny");

assert_eq!(rule.plugin_name(), "react");
assert_eq!(rule.name(), "exhaustive-deps");
assert_eq!(sev, &AllowWarnDeny::Deny);

let builder = builder.with_filter(
&LintFilter::new(AllowWarnDeny::Allow, "react-hooks/exhaustive-deps").unwrap(),
);

// Allowing the rule removes it from rules "overlay"
assert_eq!(
builder
.rules
.iter()
.find(|(r, _)| r.plugin_name() == "react" && r.name() == "exhaustive-deps"),
None
);
}

#[test]
fn test_categories() {
let oxlintrc: Oxlintrc = serde_json::from_str(
Expand Down
3 changes: 3 additions & 0 deletions crates/oxc_linter/src/config/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,10 @@ fn parse_rule_key(name: &str) -> (String, String) {
name.to_string(),
);
};
unalias_plugin_name(plugin_name, rule_name)
}

pub(super) fn unalias_plugin_name(plugin_name: &str, rule_name: &str) -> (String, String) {
let (oxlint_plugin_name, rule_name) = match plugin_name {
"@typescript-eslint" => ("typescript", rule_name),
// import-x has the same rules but better performance
Expand Down
Loading