Respect unused-noqa via per-file-ignores

astral-sh · Dec 28, 2023 · 7f9e926 · 7f9e926
1 parent 5d4825b
commit 7f9e926
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/crates/ruff_linter/src/checkers/noqa.rs b/crates/ruff_linter/src/checkers/noqa.rs
@@ -11,7 +11,7 @@ use ruff_source_file::Locator;
 
 use crate::noqa;
 use crate::noqa::{Directive, FileExemption, NoqaDirectives, NoqaMapping};
-use crate::registry::{AsRule, Rule};
+use crate::registry::{AsRule, Rule, RuleSet};
 use crate::rule_redirects::get_redirect_target;
 use crate::rules::ruff::rules::{UnusedCodes, UnusedNOQA};
 use crate::settings::LinterSettings;
@@ -23,6 +23,7 @@ pub(crate) fn check_noqa(
     comment_ranges: &CommentRanges,
     noqa_line_for: &NoqaMapping,
     analyze_directives: bool,
+    per_file_ignores: RuleSet,
     settings: &LinterSettings,
 ) -> Vec<usize> {
     // Identify any codes that are globally exempted (within the current file).
@@ -119,7 +120,7 @@ pub(crate) fn check_noqa(
                     let mut unknown_codes = vec![];
                     let mut unmatched_codes = vec![];
                     let mut valid_codes = vec![];
-                    let mut self_ignore = false;
+                    let mut self_ignore = per_file_ignores.contains(Rule::UnusedNOQA);
                     for code in directive.codes() {
                         let code = get_redirect_target(code).unwrap_or(code);
                         if Rule::UnusedNOQA.noqa_code() == code {

diff --git a/crates/ruff_linter/src/linter.rs b/crates/ruff_linter/src/linter.rs
@@ -31,7 +31,7 @@ use crate::fix::{fix_file, FixResult};
 use crate::logging::DisplayParseError;
 use crate::message::Message;
 use crate::noqa::add_noqa;
-use crate::registry::{AsRule, Rule};
+use crate::registry::{AsRule, Rule, RuleSet};
 use crate::rules::pycodestyle;
 use crate::settings::types::UnsafeFixes;
 use crate::settings::{flags, LinterSettings};
@@ -213,12 +213,14 @@ pub fn check_path(
     }
 
     // Ignore diagnostics based on per-file-ignores.
-    if !diagnostics.is_empty() && !settings.per_file_ignores.is_empty() {
-        let ignores = fs::ignores_from_path(path, &settings.per_file_ignores);
-        if !ignores.is_empty() {
-            diagnostics.retain(|diagnostic| !ignores.contains(diagnostic.kind.rule()));
-        }
+    let per_file_ignores = if !diagnostics.is_empty() && !settings.per_file_ignores.is_empty() {
+        fs::ignores_from_path(path, &settings.per_file_ignores)
+    } else {
+        RuleSet::empty()
     };
+    if !per_file_ignores.is_empty() {
+        diagnostics.retain(|diagnostic| !per_file_ignores.contains(diagnostic.kind.rule()));
+    }
 
     // Enforce `noqa` directives.
     if (noqa.into() && !diagnostics.is_empty())
@@ -234,6 +236,7 @@ pub fn check_path(
             indexer.comment_ranges(),
             &directives.noqa_line_for,
             error.is_none(),
+            per_file_ignores,
             settings,
         );
         if noqa.into() {