feat(linter): support ignorePatterns for nested configs

Author: Sysix

Cargo.lock

@@ -119,15 +119,6 @@ impl 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();
 
@@ -180,7 +171,6 @@ impl LintRunner {
 
         let walker = Walk::new(&paths, &ignore_options, override_builder);
         let paths = walker.paths();
-        let number_of_files = paths.len();
 
         let mut external_plugin_store = ExternalPluginStore::default();
 
@@ -313,10 +303,17 @@ impl LintRunner {
             return ret;
         }
 
+        let files_to_lint = paths
+            .into_iter()
+            .filter(|path| !config_store.should_ignore(Path::new(path)))
+            .collect::<Vec<Arc<OsStr>>>();
+
         let linter = Linter::new(LintOptions::default(), config_store, self.external_linter)
             .with_fix(fix_options.fix_kind())
             .with_report_unused_directives(report_unused_directives);
 
+        let number_of_files = files_to_lint.len();
+
         let tsconfig = basic_options.tsconfig;
         if let Some(path) = tsconfig.as_ref() {
             if path.is_file() {
@@ -343,7 +340,7 @@ impl LintRunner {
         // Spawn linting in another thread so diagnostics can be printed immediately from diagnostic_service.run.
         rayon::spawn(move || {
             let mut lint_service = LintService::new(linter, allocator_pool, options);
-            lint_service.with_paths(paths);
+            lint_service.with_paths(files_to_lint);
 
             // Use `RawTransferFileSystem` if `oxlint2` feature is enabled.
             // This reads the source text into start of allocator, instead of the end.
@@ -555,30 +552,6 @@ impl LintRunner {
             Ok(None)
         }
     }
-
-    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()
-        }
-    }
 }
 
 pub fn print_and_flush_stdout(stdout: &mut dyn Write, message: &str) {
@@ -1051,21 +1024,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 = &[];

apps/oxlint/src/lint.rs

@@ -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 0 files with 88 rules using 1 threads.
 ----------
-CLI result: LintNoFilesFound
+CLI result: LintSucceeded
 ----------

apps/oxlint/src/snapshots/_-c fixtures__config_ignore_patterns__ignore_extension__eslintrc.json fixtures__config_ignore_patterns__ignore_extension__main.js@oxlint.snap

@@ -5,14 +5,8 @@ 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.
-Finished in <variable>ms on 1 file with 88 rules using 1 threads.
+Found 0 warnings and 0 errors.
+Finished in <variable>ms on 0 files with 88 rules using 1 threads.
 ----------
 CLI result: LintSucceeded
 ----------

apps/oxlint/src/snapshots/fixtures__config_ignore_patterns__with_oxlintrc_-c .__test__eslintrc.json --ignore-pattern _.ts .@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 88 rules using 1 threads.
+Finished in <variable>ms on 0 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 88 rules using 1 threads.
+Finished in <variable>ms on 0 files using 1 threads.
 ----------
 CLI result: LintSucceeded
 ----------

apps/oxlint/src/snapshots/fixtures__ignore_file_current_dir_ .@oxlint.snap

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "no-debugger": "error"
+  }
+}

crates/oxc_language_server/fixtures/linter/root_ignore_patterns/.oxlintrc.json renamed to crates/oxc_language_server/fixtures/linter/ignore_patterns/.oxlintrc.json

@@ -0,0 +1,2 @@
+debugger;
+

crates/oxc_language_server/fixtures/linter/ignore_patterns/another_config/.oxlintrc.json

@@ -92,6 +92,10 @@ impl IsolatedLintHandler {
             return None;
         }
 
+        if self.service.should_ignore(&path) {
+            return None;
+        }
+
         let allocator = Allocator::default();
 
         Some(self.lint_path(&allocator, &path, content).map_or(vec![], |errors| {