Skip to content
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.

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

fix(linter): can't disable no-nested-ternary rule anymore #8600

Merged
merged 2 commits into from
Jan 31, 2025
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
10 changes: 10 additions & 0 deletions apps/oxlint/fixtures/two_rules_with_same_name/.oxlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"plugins": [
"oxc",
"unicorn"
],
"rules": {
"eslint/no-nested-ternary": "off",
"unicorn/no-nested-ternary": "off"
}
}
1 change: 1 addition & 0 deletions apps/oxlint/fixtures/two_rules_with_same_name/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log(bar ? baz : qux === quxx ? bing : bam);
7 changes: 7 additions & 0 deletions apps/oxlint/src/lint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,13 @@ mod test {
.test_and_snapshot_multiple(&[args_1, args_2]);
}

#[test]
fn test_two_rules_with_same_name_from_different_plugin_names() {
// Issue: <https://github.com/oxc-project/oxc/issues/8485>
let args = &["-c", ".oxlintrc.json", "test.js"];
Tester::new().with_cwd("fixtures/two_rules_with_same_name".into()).test_and_snapshot(args);
}

#[test]
fn test_adjust_ignore_patterns() {
let base = PathBuf::from("/project/root");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
source: apps/oxlint/src/tester.rs
---
##########
arguments: -c .oxlintrc.json test.js
working directory: fixtures/two_rules_with_same_name
----------
Found 0 warnings and 0 errors.
Finished in <variable>ms on 1 file with 74 rules using 1 threads.
----------
CLI result: LintSucceeded
----------
76 changes: 43 additions & 33 deletions crates/oxc_linter/src/config/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,28 +110,43 @@ impl OxlintRules {
}
}
_ => {
// For overlapping rule names, use the "error" one
// "no-loss-of-precision": "off",
// "@typescript-eslint/no-loss-of-precision": "error"
if let Some(rule_config) =
rule_configs.iter().find(|r| r.severity.is_warn_deny())
{
let config = rule_config.config.clone().unwrap_or_default();

if let Some(rule) = rules_for_override.iter().find(|r| r.name() == *name) {
rules_to_replace
.push(RuleWithSeverity::new(rule.read_json(config), rule.severity));
}
// If the given rule is not found in the rule list (for example, if all rules are disabled),
// then look it up in the entire rules list and add it.
else if let Some(rule) = all_rules.iter().find(|r| r.name() == *name) {
rules_to_replace.push(RuleWithSeverity::new(
rule.read_json(config),
rule_config.severity,
));
}
} else if rule_configs.iter().all(|r| r.severity.is_allow()) {
if let Some(rule) = rules_for_override.iter().find(|r| r.name() == *name) {
let rules = rules_for_override
.iter()
.filter_map(|r| {
if r.name() == *name {
Some((r.plugin_name(), r))
} else {
None
}
})
.collect::<FxHashMap<_, _>>();

for rule_config in rule_configs {
let (rule_name, plugin_name) = transform_rule_and_plugin_name(
&rule_config.rule_name,
&rule_config.plugin_name,
);

if rule_config.severity.is_warn_deny() {
let config = rule_config.config.clone().unwrap_or_default();
if let Some(rule) = rules.get(&plugin_name) {
rules_to_replace.push(RuleWithSeverity::new(
rule.read_json(config),
rule.severity,
));
}
// If the given rule is not found in the rule list (for example, if all rules are disabled),
// then look it up in the entire rules list and add it.
else if let Some(rule) = all_rules
.iter()
.find(|r| r.name() == rule_name && r.plugin_name() == plugin_name)
{
rules_to_replace.push(RuleWithSeverity::new(
rule.read_json(config),
rule_config.severity,
));
}
} else if let Some(&rule) = rules.get(&plugin_name) {
rules_to_remove.push(rule.clone());
}
}
Expand All @@ -152,17 +167,12 @@ fn transform_rule_and_plugin_name<'a>(
rule_name: &'a str,
plugin_name: &'a str,
) -> (&'a str, &'a str) {
if plugin_name == "vitest" && is_jest_rule_adapted_to_vitest(rule_name) {
return (rule_name, "jest");
}

if plugin_name == "typescript" && is_eslint_rule_adapted_to_typescript(rule_name) {
return (rule_name, "eslint");
}

if plugin_name == "unicorn" && rule_name == "no-negated-condition" {
return ("no-negated-condition", "eslint");
}
let plugin_name = match plugin_name {
"vitest" if is_jest_rule_adapted_to_vitest(rule_name) => "jest",
"unicorn" if rule_name == "no-negated-condition" => "eslint",
"typescript" if is_eslint_rule_adapted_to_typescript(rule_name) => "eslint",
_ => plugin_name,
};

(rule_name, plugin_name)
}
Expand Down