feat(linter): support ignorePatterns for nested configs

Sysix · Sysix · commit f43d9d559661 · 2025-07-13T11:59:43.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/oxlint/src/lint.rs b/apps/oxlint/src/lint.rs
@@ -109,15 +109,6 @@ impl Runner for LintRunner {
                     builder.add(&pattern).unwrap();
                 }
             }
-            if !oxlintrc.ignore_patterns.is_empty() {
-                let oxlint_wd = oxlintrc.path.parent().unwrap_or(&self.cwd).to_path_buf();
-                oxlintrc.ignore_patterns =
-                    Self::adjust_ignore_patterns(&self.cwd, &oxlint_wd, oxlintrc.ignore_patterns);
-                for pattern in &oxlintrc.ignore_patterns {
-                    let pattern = format!("!{pattern}");
-                    builder.add(&pattern).unwrap();
-                }
-            }
 
             let builder = builder.build().unwrap();
 
@@ -538,30 +529,6 @@ impl LintRunner {
             Err("No oxlint config file found".to_string())
         }
     }
-
-    fn adjust_ignore_patterns(
-        base: &PathBuf,
-        path: &PathBuf,
-        ignore_patterns: Vec<String>,
-    ) -> Vec<String> {
-        if base == path {
-            ignore_patterns
-        } else {
-            let relative_ignore_path =
-                path.strip_prefix(base).map_or_else(|_| PathBuf::from("."), Path::to_path_buf);
-
-            ignore_patterns
-                .into_iter()
-                .map(|pattern| {
-                    let prefix_len = pattern.bytes().take_while(|&c| c == b'!').count();
-                    let (prefix, pattern) = pattern.split_at(prefix_len);
-
-                    let adjusted_path = relative_ignore_path.join(pattern);
-                    format!("{prefix}{}", adjusted_path.to_string_lossy().cow_replace('\\', "/"))
-                })
-                .collect()
-        }
-    }
 }
 
 fn print_and_flush_stdout(stdout: &mut dyn Write, message: &str) {
@@ -1044,21 +1011,6 @@ mod test {
         Tester::new().with_cwd("fixtures/report_unused_directives".into()).test_and_snapshot(args);
     }
 
-    #[test]
-    fn test_adjust_ignore_patterns() {
-        let base = PathBuf::from("/project/root");
-        let path = PathBuf::from("/project/root/src");
-        let ignore_patterns =
-            vec![String::from("target"), String::from("!dist"), String::from("!!dist")];
-
-        let adjusted_patterns = LintRunner::adjust_ignore_patterns(&base, &path, ignore_patterns);
-
-        assert_eq!(
-            adjusted_patterns,
-            vec![String::from("src/target"), String::from("!src/dist"), String::from("!!src/dist")]
-        );
-    }
-
     #[test]
     fn test_nested_config() {
         let args = &[];
diff --git a/apps/oxlint/src/snapshots/_-c fixtures__config_ignore_patterns__ignore_extension__eslintrc.json fixtures__config_ignore_patterns__ignore_extension@oxlint.snap b/apps/oxlint/src/snapshots/_-c fixtures__config_ignore_patterns__ignore_extension__eslintrc.json fixtures__config_ignore_patterns__ignore_extension@oxlint.snap
@@ -12,7 +12,7 @@ working directory:
   help: Delete this file or add some code to it.
 
 Found 1 warning and 0 errors.
-Finished in <variable>ms on 1 file with 87 rules using 1 threads.
+Finished in <variable>ms on 2 files with 87 rules using 1 threads.
 ----------
 CLI result: LintSucceeded
 ----------
diff --git a/apps/oxlint/src/snapshots/_-c fixtures__config_ignore_patterns__ignore_extension__eslintrc.json fixtures__config_ignore_patterns__ignore_extension__main.js@oxlint.snap b/apps/oxlint/src/snapshots/_-c fixtures__config_ignore_patterns__ignore_extension__eslintrc.json fixtures__config_ignore_patterns__ignore_extension__main.js@oxlint.snap
@@ -5,7 +5,8 @@ source: apps/oxlint/src/tester.rs
 arguments: -c fixtures/config_ignore_patterns/ignore_extension/eslintrc.json fixtures/config_ignore_patterns/ignore_extension/main.js
 working directory: 
 ----------
-Finished in <variable>ms on 0 files using 1 threads.
+Found 0 warnings and 0 errors.
+Finished in <variable>ms on 1 file with 87 rules using 1 threads.
 ----------
-CLI result: LintNoFilesFound
+CLI result: LintSucceeded
 ----------
diff --git a/apps/oxlint/src/snapshots/fixtures__config_ignore_patterns__ignore_directory_-c eslintrc.json@oxlint.snap b/apps/oxlint/src/snapshots/fixtures__config_ignore_patterns__ignore_directory_-c eslintrc.json@oxlint.snap
@@ -14,7 +14,7 @@ working directory: fixtures/config_ignore_patterns/ignore_directory
   help: Delete this file or add some code to it.
 
 Found 1 warning and 0 errors.
-Finished in <variable>ms on 1 file with 87 rules using 1 threads.
+Finished in <variable>ms on 2 files with 87 rules using 1 threads.
 ----------
 CLI result: LintSucceeded
 ----------
diff --git a/apps/oxlint/src/snapshots/fixtures__config_ignore_patterns__with_oxlintrc_-c .__test__eslintrc.json --ignore-pattern _.ts .@oxlint.snap b/apps/oxlint/src/snapshots/fixtures__config_ignore_patterns__with_oxlintrc_-c .__test__eslintrc.json --ignore-pattern _.ts .@oxlint.snap
@@ -5,13 +5,7 @@ source: apps/oxlint/src/tester.rs
 arguments: -c ./test/eslintrc.json --ignore-pattern *.ts .
 working directory: fixtures/config_ignore_patterns/with_oxlintrc
 ----------
-
-  ! ]8;;https://oxc.rs/docs/guide/usage/linter/rules/unicorn/no-empty-file.html\eslint-plugin-unicorn(no-empty-file)]8;;\: Empty files are not allowed.
-   ,-[main.js:1:1]
-   `----
-  help: Delete this file or add some code to it.
-
-Found 1 warning and 0 errors.
+Found 0 warnings 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__ignore_file_current_dir_ .@oxlint.snap b/apps/oxlint/src/snapshots/fixtures__ignore_file_current_dir_ .@oxlint.snap
@@ -6,7 +6,7 @@ arguments:
 working directory: fixtures/ignore_file_current_dir
 ----------
 Found 0 warnings and 0 errors.
-Finished in <variable>ms on 0 files with 87 rules using 1 threads.
+Finished in <variable>ms on 2 files using 1 threads.
 ----------
 CLI result: LintSucceeded
 ----------
@@ -16,7 +16,7 @@ arguments: .
 working directory: fixtures/ignore_file_current_dir
 ----------
 Found 0 warnings and 0 errors.
-Finished in <variable>ms on 0 files with 87 rules using 1 threads.
+Finished in <variable>ms on 2 files using 1 threads.
 ----------
 CLI result: LintSucceeded
 ----------
diff --git a/crates/oxc_language_server/src/linter/server_linter.rs b/crates/oxc_language_server/src/linter/server_linter.rs
@@ -50,10 +50,9 @@ impl ServerLinter {
             Oxlintrc::default()
         };
 
-        // clone because we are returning it for ignore builder
         let config_builder = ConfigStoreBuilder::from_oxlintrc(
             false,
-            oxlintrc.clone(),
+            oxlintrc,
             None,
             &mut ExternalPluginStore::default(),
         )
@@ -101,7 +100,7 @@ impl ServerLinter {
 
         Self {
             isolated_linter: Arc::new(Mutex::new(isolated_linter)),
-            gitignore_glob: Self::create_ignore_glob(&root_path, &oxlintrc),
+            gitignore_glob: Self::create_ignore_glob(&root_path),
             extended_paths,
         }
     }
@@ -148,7 +147,7 @@ impl ServerLinter {
         (nested_configs, extended_paths)
     }
 
-    fn create_ignore_glob(root_path: &Path, oxlintrc: &Oxlintrc) -> Vec<Gitignore> {
+    fn create_ignore_glob(root_path: &Path) -> Vec<Gitignore> {
         let mut builder = globset::GlobSetBuilder::new();
         // Collecting all ignore files
         builder.add(Glob::new("**/.eslintignore").unwrap());
@@ -179,20 +178,6 @@ impl ServerLinter {
             }
         }
 
-        if oxlintrc.ignore_patterns.is_empty() {
-            return gitignore_globs;
-        }
-
-        let Some(oxlintrc_dir) = oxlintrc.path.parent() else {
-            warn!("Oxlintrc path has no parent, skipping inline ignore patterns");
-            return gitignore_globs;
-        };
-
-        let mut builder = ignore::gitignore::GitignoreBuilder::new(oxlintrc_dir);
-        for entry in &oxlintrc.ignore_patterns {
-            builder.add_line(None, entry).expect("Failed to add ignore line");
-        }
-        gitignore_globs.push(builder.build().unwrap());
         gitignore_globs
     }
 
diff --git a/crates/oxc_language_server/src/snapshots/fixtures_linter_root_ignore_patterns@ignored-file.ts.snap b/crates/oxc_language_server/src/snapshots/fixtures_linter_root_ignore_patterns@ignored-file.ts.snap
@@ -2,4 +2,4 @@
 source: crates/oxc_language_server/src/tester.rs
 input_file: crates/oxc_language_server/fixtures/linter/root_ignore_patterns/ignored-file.ts
 ---
-File is ignored
+No diagnostic reports
diff --git a/crates/oxc_linter/Cargo.toml b/crates/oxc_linter/Cargo.toml
@@ -53,6 +53,7 @@ cow-utils = { workspace = true }
 fast-glob = { workspace = true }
 globset = { workspace = true }
 icu_segmenter = { workspace = true }
+ignore = { workspace = true }
 indexmap = { workspace = true, features = ["rayon"] }
 itertools = { workspace = true }
 javascript-globals = { workspace = true }
diff --git a/crates/oxc_linter/src/config/config_builder.rs b/crates/oxc_linter/src/config/config_builder.rs
@@ -182,6 +182,10 @@ impl ConfigStoreBuilder {
             settings: oxlintrc.settings,
             env: oxlintrc.env,
             globals: oxlintrc.globals,
+            ignore_patterns: LintConfig::resolve_oxlintrc_ignore_patterns(
+                &oxlintrc.ignore_patterns,
+                &oxlintrc.path,
+            ),
             path: Some(oxlintrc.path),
         };
 
diff --git a/crates/oxc_linter/src/config/config_store.rs b/crates/oxc_linter/src/config/config_store.rs
@@ -10,6 +10,7 @@ use super::{
 };
 use crate::{
     AllowWarnDeny, LintPlugins,
+    config::ResolvedIgnorePatterns,
     external_plugin_store::{ExternalPluginStore, ExternalRuleId},
     rules::{RULES, RuleEnum},
 };
@@ -91,6 +92,10 @@ impl Config {
         &self.base.rules
     }
 
+    pub fn ignore_patterns(&self) -> Option<&ResolvedIgnorePatterns> {
+        self.base.config.ignore_patterns.as_ref()
+    }
+
     pub fn number_of_rules(&self) -> usize {
         self.base.rules.len()
     }
@@ -259,16 +264,18 @@ impl ConfigStore {
         &self.base.base.config.plugins
     }
 
-    pub(crate) fn resolve(&self, path: &Path) -> ResolvedLinterState {
-        let resolved_config = if self.nested_configs.is_empty() {
+    pub(crate) fn get_related_config(&self, path: &Path) -> &Config {
+        if self.nested_configs.is_empty() {
             &self.base
         } else if let Some(config) = self.get_nearest_config(path) {
             config
         } else {
             &self.base
-        };
+        }
+    }
 
-        Config::apply_overrides(resolved_config, path, &self.external_plugin_store)
+    pub(crate) fn resolve(&self, path: &Path) -> ResolvedLinterState {
+        Config::apply_overrides(self.get_related_config(path), path, &self.external_plugin_store)
     }
 
     fn get_nearest_config(&self, path: &Path) -> Option<&Config> {
@@ -296,10 +303,7 @@ mod test {
     use super::{ConfigStore, OxlintOverrides};
     use crate::{
         AllowWarnDeny, BuiltinLintPlugins, ExternalPluginStore, LintPlugins, RuleEnum,
-        config::{
-            LintConfig, OxlintEnv, OxlintGlobals, OxlintSettings, categories::OxlintCategories,
-            config_store::Config,
-        },
+        config::{LintConfig, OxlintEnv, categories::OxlintCategories, config_store::Config},
     };
 
     macro_rules! from_json {
@@ -466,10 +470,7 @@ mod test {
     fn test_add_plugins() {
         let base_config = LintConfig {
             plugins: LintPlugins::new(BuiltinLintPlugins::IMPORT, FxHashSet::default()),
-            env: OxlintEnv::default(),
-            settings: OxlintSettings::default(),
-            globals: OxlintGlobals::default(),
-            path: None,
+            ..Default::default()
         };
         let overrides = from_json!([{
             "files": ["*.jsx", "*.tsx"],
@@ -508,13 +509,8 @@ mod test {
 
     #[test]
     fn test_add_env() {
-        let base_config = LintConfig {
-            env: OxlintEnv::default(),
-            plugins: BuiltinLintPlugins::ESLINT.into(),
-            settings: OxlintSettings::default(),
-            globals: OxlintGlobals::default(),
-            path: None,
-        };
+        let base_config =
+            LintConfig { plugins: BuiltinLintPlugins::ESLINT.into(), ..Default::default() };
 
         let overrides = from_json!([{
             "files": ["*.tsx"],
@@ -536,13 +532,8 @@ mod test {
 
     #[test]
     fn test_replace_env() {
-        let base_config = LintConfig {
-            env: OxlintEnv::from_iter(["es2024".into()]),
-            plugins: BuiltinLintPlugins::ESLINT.into(),
-            settings: OxlintSettings::default(),
-            globals: OxlintGlobals::default(),
-            path: None,
-        };
+        let base_config =
+            LintConfig { env: OxlintEnv::from_iter(["es2024".into()]), ..Default::default() };
 
         let overrides = from_json!([{
             "files": ["*.tsx"],
@@ -564,13 +555,8 @@ mod test {
 
     #[test]
     fn test_add_globals() {
-        let base_config = LintConfig {
-            env: OxlintEnv::default(),
-            plugins: BuiltinLintPlugins::ESLINT.into(),
-            settings: OxlintSettings::default(),
-            globals: OxlintGlobals::default(),
-            path: None,
-        };
+        let base_config =
+            LintConfig { plugins: BuiltinLintPlugins::ESLINT.into(), ..Default::default() };
 
         let overrides = from_json!([{
             "files": ["*.tsx"],
@@ -596,14 +582,12 @@ mod test {
     #[test]
     fn test_replace_globals() {
         let base_config = LintConfig {
-            env: OxlintEnv::default(),
             plugins: BuiltinLintPlugins::ESLINT.into(),
-            settings: OxlintSettings::default(),
             globals: from_json!({
                 "React": "readonly",
                 "Secret": "writeable"
             }),
-            path: None,
+            ..Default::default()
         };
 
         let overrides = from_json!([{
diff --git a/crates/oxc_linter/src/config/mod.rs b/crates/oxc_linter/src/config/mod.rs
diff --git a/crates/oxc_linter/src/service/runtime.rs b/crates/oxc_linter/src/service/runtime.rs
diff --git a/editors/vscode/.oxlintrc.json b/editors/vscode/.oxlintrc.json
