dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(linter): keep rules disabled if the rule is not enabled in the config (#2031)

Browse source 
relates #1969
This commit is contained in:
Boshen 2024-01-15 13:32:51 +08:00 committed by GitHub
parent 3490111c56
commit 68606c4d6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/oxc_cli/fixtures/no_console_off/eslintrc.json Normal file
View file

@ -0,0 +1,5 @@
{
"rules": {
"no-console": "off"
}
}

1
crates/oxc_cli/fixtures/no_console_off/test.js Normal file
View file

@ -0,0 +1 @@
console.log()

10
crates/oxc_cli/src/lint/mod.rs
View file

@ -363,6 +363,16 @@ mod test {
assert_eq!(result.number_of_errors, 0); assert_eq!(result.number_of_errors, 0);
} }
#[test]
fn no_console_off() {
let args =
&["-c", "fixtures/no_console_off/eslintrc.json", "fixtures/no_console_off/test.js"];
let result = test(args);
assert_eq!(result.number_of_files, 1);
assert_eq!(result.number_of_warnings, 0);
assert_eq!(result.number_of_errors, 0);
}
#[test] #[test]
fn typescript_eslint() { fn typescript_eslint() {
let args = &[ let args = &[

21
crates/oxc_linter/src/config/mod.rs
View file

@ -88,20 +88,23 @@ impl ESLintConfig {
let rule_config = &rule_configs[0]; let rule_config = &rule_configs[0];
let rule_name = &rule_config.rule_name; let rule_name = &rule_config.rule_name;
let plugin_name = &rule_config.plugin_name; let plugin_name = &rule_config.plugin_name;
if let Some(rule) = rules_for_override.iter().find(|r| r.name() == rule_name) { match rule_config.severity {
match rule_config.severity { AllowWarnDeny::Warn | AllowWarnDeny::Deny => {
AllowWarnDeny::Warn | AllowWarnDeny::Deny => { if let Some(rule) = all_rules
.iter()
.find(|r| r.name() == rule_name && r.plugin_name() == plugin_name)
{
rules_to_replace.push(rule.read_json(rule_config.config.clone())); rules_to_replace.push(rule.read_json(rule_config.config.clone()));
} }
AllowWarnDeny::Allow => { }
AllowWarnDeny::Allow => {
if let Some(rule) = rules_for_override
.iter()
.find(|r| r.name() == rule_name && r.plugin_name() == plugin_name)
{
rules_to_remove.push(rule.clone()); rules_to_remove.push(rule.clone());
} }
} }
} else if let Some(rule) = all_rules
.iter()
.find(|r| r.plugin_name() == plugin_name && r.name() == rule_name)
{
rules_to_replace.push(rule.read_json(rule_config.config.clone()));
} }
} }
_ => { _ => {