Refactor suppressions checking into check_noqa

Author: amyreese

crates/ruff_linter/src/checkers/noqa.rs

@@ -18,11 +18,13 @@ use crate::rules::pygrep_hooks;
 use crate::rules::ruff;
 use crate::rules::ruff::rules::{UnusedCodes, UnusedNOQA};
 use crate::settings::LinterSettings;
+use crate::suppression::Suppressions;
 use crate::{Edit, Fix, Locator};
 
 use super::ast::LintContext;
 
 /// RUF100
+#[expect(clippy::too_many_arguments)]
 pub(crate) fn check_noqa(
     context: &mut LintContext,
     path: &Path,
@@ -31,6 +33,7 @@ pub(crate) fn check_noqa(
     noqa_line_for: &NoqaMapping,
     analyze_directives: bool,
     settings: &LinterSettings,
+    suppressions: &Suppressions,
 ) -> Vec<usize> {
     // Identify any codes that are globally exempted (within the current file).
     let file_noqa_directives =
@@ -60,11 +63,19 @@ pub(crate) fn check_noqa(
             continue;
         }
 
+        // Apply file-level suppressions first
         if exemption.contains_secondary_code(code) {
             ignored_diagnostics.push(index);
             continue;
         }
 
+        // Apply ranged suppressions next
+        if suppressions.check_diagnostic(diagnostic) {
+            ignored_diagnostics.push(index);
+            continue;
+        }
+
+        // Apply end-of-line noqa suppressions last
         let noqa_offsets = diagnostic
             .parent()
             .into_iter()

crates/ruff_linter/src/linter.rs

@@ -326,20 +326,13 @@ pub fn check_path(
         }
     }
 
-    // Apply range suppressions before noqa, so that #noqa on a line already covered by a range
-    // will be reported as unused noqa rather than unused range.
-    // TODO: check if enabled?
-    {
-        let suppressions = Suppressions::from_tokens(locator.contents(), tokens);
-        suppressions.filter_diagnostics(&mut context);
-    }
-
     // Enforce `noqa` directives.
     if noqa.is_enabled()
         || context
             .iter_enabled_rules()
             .any(|rule_code| rule_code.lint_source().is_noqa())
     {
+        let suppressions = Suppressions::from_tokens(locator.contents(), tokens);
         let ignored = check_noqa(
             &mut context,
             path,
@@ -348,6 +341,7 @@ pub fn check_path(
             &directives.noqa_line_for,
             parsed.has_valid_syntax(),
             settings,
+            &suppressions,
         );
         if noqa.is_enabled() {
             for index in ignored.iter().rev() {

crates/ruff_linter/src/suppression.rs

@@ -1,5 +1,6 @@
 use compact_str::CompactString;
 use core::fmt;
+use ruff_db::diagnostic::Diagnostic;
 use ruff_python_parser::{TokenKind, Tokens};
 use ruff_source_file::LineRanges;
 use std::{error::Error, fmt::Formatter};
@@ -9,8 +10,6 @@ use ruff_python_trivia::{Cursor, is_python_whitespace};
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize, TextSlice};
 use smallvec::{SmallVec, smallvec};
 
-use crate::checkers::ast::LintContext;
-
 #[allow(unused)]
 #[derive(Clone, Debug, Eq, PartialEq)]
 enum SuppressionAction {
@@ -119,33 +118,24 @@ impl Suppressions {
         builder.load_from_tokens(tokens)
     }
 
-    /// Check reported diagnostics against the set of valid range suppressions, and remove any
-    /// diagnostics from the context that should be suppressed by those ranges.
-    pub(crate) fn filter_diagnostics(&self, context: &mut LintContext) {
-        let mut ignored: Vec<usize> = vec![];
-
-        'outer: for (index, diagnostic) in context.iter().enumerate() {
-            let Some(code) = diagnostic.secondary_code() else {
-                continue;
-            };
-            let Some(span) = diagnostic.primary_span() else {
-                continue;
-            };
-            let Some(range) = span.range() else {
-                continue;
-            };
-
-            for suppression in &self.valid {
-                if *code == suppression.code.as_str() && suppression.range.contains_range(range) {
-                    ignored.push(index);
-                    continue 'outer;
-                }
+    /// Check if a diagnostic is suppressed by any known range suppressions
+    pub(crate) fn check_diagnostic(&self, diagnostic: &Diagnostic) -> bool {
+        let Some(code) = diagnostic.secondary_code() else {
+            return false;
+        };
+        let Some(span) = diagnostic.primary_span() else {
+            return false;
+        };
+        let Some(range) = span.range() else {
+            return false;
+        };
+
+        for suppression in &self.valid {
+            if *code == suppression.code.as_str() && suppression.range.contains_range(range) {
+                return true;
             }
         }
-
-        for index in ignored.iter().rev() {
-            context.as_mut_vec().swap_remove(*index);
-        }
+        false
     }
 }