fix(linter): correctly inherit categories when plugins are enabled (#11353)

camc314 · web-flow · commit 0946dacf699e · 2025-06-05T20:41:45.000+01:00
fixes #10394 fixes #9649
diff --git a/apps/oxlint/fixtures/issue_10394/.oxlintrc.json b/apps/oxlint/fixtures/issue_10394/.oxlintrc.json
@@ -0,0 +1,9 @@
+{
+  "overrides": [
+    {
+      "plugins": ["jest", "vitest"],
+      "files": ["**/*.test.ts"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/apps/oxlint/fixtures/issue_10394/foo.test.ts b/apps/oxlint/fixtures/issue_10394/foo.test.ts
@@ -0,0 +1,3 @@
+describe("", () => {
+  //
+});
diff --git a/apps/oxlint/fixtures/overrides_with_plugin/index.test.ts b/apps/oxlint/fixtures/overrides_with_plugin/index.test.ts
@@ -1,7 +1,10 @@
 describe("", () => {
-  //
+  // ^ jest/no-valid-title error as explicitly set in the `.test.ts` override
 
   it("", () => {});
+  // ^ jest/no-valid-title error as explicitly set in the `.test.ts` override
+  // ^ jest/expect-expect as `jest` plugin is enabled and `jest/expect-expect` is a correctness rule
 });
 
 const foo = 123;
+// no no-unused-vars error as override disables this rule for `.test.ts` files
diff --git a/apps/oxlint/fixtures/overrides_with_plugin/index.ts b/apps/oxlint/fixtures/overrides_with_plugin/index.ts
@@ -1 +1,2 @@
 const foo = 123;
+// no-unused-vars error expected as `eslint` plugin and `correctness` categories are on by default (override is not applied.)
diff --git a/apps/oxlint/src/lint.rs b/apps/oxlint/src/lint.rs
@@ -1150,4 +1150,10 @@ mod test {
         let args = &["-c", ".oxlintrc.json"];
         Tester::new().with_cwd("fixtures/overrides_with_plugin".into()).test_and_snapshot(args);
     }
+
+    #[test]
+    fn test_plugins_inside_overrides_categories_enabled_correctly() {
+        let args = &["-c", ".oxlintrc.json"];
+        Tester::new().with_cwd("fixtures/issue_10394".into()).test_and_snapshot(args);
+    }
 }
diff --git a/apps/oxlint/src/snapshots/fixtures__issue_10394_-c .oxlintrc.json@oxlint.snap b/apps/oxlint/src/snapshots/fixtures__issue_10394_-c .oxlintrc.json@oxlint.snap
@@ -0,0 +1,21 @@
+---
+source: apps/oxlint/src/tester.rs
+---
+########## 
+arguments: -c .oxlintrc.json
+working directory: fixtures/issue_10394
+----------
+
+  ! ]8;;https://oxc.rs/docs/guide/usage/linter/rules/jest/valid-title.html\eslint-plugin-jest(valid-title)]8;;\: "Should not have an empty title"
+   ,-[foo.test.ts:1:10]
+ 1 | describe("", () => {
+   :          ^^
+ 2 |   //
+   `----
+  help: "Write a meaningful title for your test"
+
+Found 1 warning and 0 errors.
+Finished in <variable>ms on 1 file with 87 rules using 1 threads.
+----------
+CLI result: LintSucceeded
+----------
diff --git a/apps/oxlint/src/snapshots/fixtures__overrides_with_plugin_-c .oxlintrc.json@oxlint.snap b/apps/oxlint/src/snapshots/fixtures__overrides_with_plugin_-c .oxlintrc.json@oxlint.snap
@@ -10,7 +10,7 @@ working directory: fixtures/overrides_with_plugin
    ,-[index.test.ts:1:10]
  1 | describe("", () => {
    :          ^^
- 2 |   //
+ 2 |   // ^ jest/no-valid-title error as explicitly set in the `.test.ts` override
    `----
   help: "Write a meaningful title for your test"
 
@@ -19,6 +19,7 @@ working directory: fixtures/overrides_with_plugin
  1 | const foo = 123;
    :       ^|^
    :        `-- 'foo' is declared here
+ 2 | // no-unused-vars error expected as `eslint` plugin and `correctness` categories are on by default (override is not applied.)
    `----
   help: Consider removing this declaration.
 
@@ -27,11 +28,20 @@ working directory: fixtures/overrides_with_plugin
  3 | 
  4 |   it("", () => {});
    :      ^^
- 5 | });
+ 5 |   // ^ jest/no-valid-title error as explicitly set in the `.test.ts` override
    `----
   help: "Write a meaningful title for your test"
 
-Found 1 warning and 2 errors.
+  ! ]8;;https://oxc.rs/docs/guide/usage/linter/rules/jest/expect-expect.html\eslint-plugin-jest(expect-expect)]8;;\: Test has no assertions
+   ,-[index.test.ts:4:3]
+ 3 | 
+ 4 |   it("", () => {});
+   :   ^^
+ 5 |   // ^ jest/no-valid-title error as explicitly set in the `.test.ts` override
+   `----
+  help: Add assertion(s) in this Test
+
+Found 2 warnings and 2 errors.
 Finished in <variable>ms on 2 files with 87 rules using 1 threads.
 ----------
 CLI result: LintFoundErrors
diff --git a/crates/oxc_linter/src/config/config_builder.rs b/crates/oxc_linter/src/config/config_builder.rs
@@ -15,12 +15,13 @@ use crate::{
     rules::RULES,
 };
 
-use super::Config;
+use super::{Config, categories::OxlintCategories};
 
 #[must_use = "You dropped your builder without building a Linter! Did you mean to call .build()?"]
 pub struct ConfigStoreBuilder {
     pub(super) rules: FxHashMap<RuleEnum, AllowWarnDeny>,
     config: LintConfig,
+    categories: OxlintCategories,
     overrides: OxlintOverrides,
     cache: RulesCache,
 
@@ -43,11 +44,12 @@ impl ConfigStoreBuilder {
     pub fn empty() -> Self {
         let config = LintConfig::default();
         let rules = FxHashMap::default();
+        let categories: OxlintCategories = OxlintCategories::default();
         let overrides = OxlintOverrides::default();
         let cache = RulesCache::new(config.plugins);
         let extended_paths = Vec::new();
 
-        Self { rules, config, overrides, cache, extended_paths }
+        Self { rules, config, categories, overrides, cache, extended_paths }
     }
 
     /// Warn on all rules in all plugins and categories, including those in `nursery`.
@@ -57,10 +59,11 @@ impl ConfigStoreBuilder {
     pub fn all() -> Self {
         let config = LintConfig { plugins: LintPlugins::all(), ..LintConfig::default() };
         let overrides = OxlintOverrides::default();
+        let categories: OxlintCategories = OxlintCategories::default();
         let cache = RulesCache::new(config.plugins);
         let rules = RULES.iter().map(|rule| (rule.clone(), AllowWarnDeny::Warn)).collect();
         let extended_paths = Vec::new();
-        Self { rules, config, overrides, cache, extended_paths }
+        Self { rules, config, categories, overrides, cache, extended_paths }
     }
 
     /// Create a [`ConfigStoreBuilder`] from a loaded or manually built [`Oxlintrc`].
@@ -138,6 +141,12 @@ impl ConfigStoreBuilder {
             Self::warn_correctness(oxlintrc.plugins.unwrap_or_default())
         };
 
+        let mut categories = oxlintrc.categories.clone();
+
+        if !start_empty {
+            categories.insert(RuleCategory::Correctness, AllowWarnDeny::Warn);
+        }
+
         let config = LintConfig {
             plugins: oxlintrc.plugins.unwrap_or_default(),
             settings: oxlintrc.settings,
@@ -147,8 +156,14 @@ impl ConfigStoreBuilder {
         };
         let cache = RulesCache::new(config.plugins);
 
-        let mut builder =
-            Self { rules, config, overrides: oxlintrc.overrides, cache, extended_paths };
+        let mut builder = Self {
+            rules,
+            config,
+            categories,
+            overrides: oxlintrc.overrides,
+            cache,
+            extended_paths,
+        };
 
         for filter in oxlintrc.categories.filters() {
             builder = builder.with_filter(&filter);
@@ -183,6 +198,11 @@ impl ConfigStoreBuilder {
         self
     }
 
+    pub fn with_categories(mut self, categories: OxlintCategories) -> Self {
+        self.categories = categories;
+        self
+    }
+
     /// Enable or disable a set of plugins, leaving unrelated plugins alone.
     ///
     /// See [`ConfigStoreBuilder::with_plugins`] for details on how plugin configuration affects your
@@ -285,7 +305,7 @@ impl ConfigStoreBuilder {
             self.rules.into_iter().collect::<Vec<_>>()
         };
         rules.sort_unstable_by_key(|(r, _)| r.id());
-        Config::new(rules, self.config, self.overrides)
+        Config::new(rules, self.categories, self.config, self.overrides)
     }
 
     /// Warn for all correctness rules in the given set of plugins.
diff --git a/crates/oxc_linter/src/config/config_store.rs b/crates/oxc_linter/src/config/config_store.rs
diff --git a/crates/oxc_linter/src/config/rules.rs b/crates/oxc_linter/src/config/rules.rs
diff --git a/crates/oxc_linter/src/tester.rs b/crates/oxc_linter/src/tester.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+describe("", () => {`
	`2`	`+ //`
	`3`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`const foo = 123;`
	`2`	+// no-unused-vars error expected as `eslint` plugin and `correctness` categories are on by default (override is not applied.)
Original file line number	Diff line number	Diff line change
`@@ -1150,4 +1150,10 @@ mod test {`
`1150`	`1150`	`let args = &["-c", ".oxlintrc.json"];`
`1151`	`1151`	`Tester::new().with_cwd("fixtures/overrides_with_plugin".into()).test_and_snapshot(args);`
`1152`	`1152`	`}`
	`1153`	`+`
	`1154`	`+ #[test]`
	`1155`	`+ fn test_plugins_inside_overrides_categories_enabled_correctly() {`
	`1156`	`+ let args = &["-c", ".oxlintrc.json"];`
	`1157`	`+ Tester::new().with_cwd("fixtures/issue_10394".into()).test_and_snapshot(args);`
	`1158`	`+ }`
`1153`	`1159`	`}`