Handle external codes and redirects

Author: amyreese

crates/ruff_linter/src/rules/ruff/rules/invalid_rule_code.rs

@@ -81,15 +81,17 @@ pub(crate) fn invalid_noqa_code(
             continue;
         };
 
-        let all_valid = directive.iter().all(|code| code_is_valid(code, external));
+        let all_valid = directive
+            .iter()
+            .all(|code| code_is_valid(code.as_str(), external));
 
         if all_valid {
             continue;
         }
 
         let (valid_codes, invalid_codes): (Vec<_>, Vec<_>) = directive
             .iter()
-            .partition(|&code| code_is_valid(code, external));
+            .partition(|&code| code_is_valid(code.as_str(), external));
 
         if valid_codes.is_empty() {
             all_codes_invalid_diagnostic(directive, invalid_codes, context);
@@ -101,10 +103,9 @@ pub(crate) fn invalid_noqa_code(
     }
 }
 
-fn code_is_valid(code: &Code, external: &[String]) -> bool {
-    let code_str = code.as_str();
-    Rule::from_code(get_redirect_target(code_str).unwrap_or(code_str)).is_ok()
-        || external.iter().any(|ext| code_str.starts_with(ext))
+pub(crate) fn code_is_valid(code: &str, external: &[String]) -> bool {
+    Rule::from_code(get_redirect_target(code).unwrap_or(code)).is_ok()
+        || external.iter().any(|ext| code.starts_with(ext))
 }
 
 fn all_codes_invalid_diagnostic(

crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__range_suppressions.snap

@@ -7,7 +7,7 @@ source: crates/ruff_linter/src/rules/ruff/mod.rs
 
 --- Summary ---
 Removed: 15
-Added: 25
+Added: 23
 
 --- Removed ---
 E741 Ambiguous variable name: `I`
@@ -653,37 +653,3 @@ help: Remove the rule code
 97 | 
 98 | 
 99 | def f():
-
-
-RUF102 [*] Invalid rule code in suppression: TK421
-   --> suppressions.py:102:5
-    |
-100 | def f():
-101 |     # External rule codes should be ignored
-102 |     # ruff: disable[TK421]
-    |     ^^^^^^^^^^^^^^^^^^^^^^
-103 |     print("hello")
-104 |     # ruff: enable[TK421]
-    |
-help: Remove the rule code
-99  | 
-100 | def f():
-101 |     # External rule codes should be ignored
-    -     # ruff: disable[TK421]
-102 |     print("hello")
-103 |     # ruff: enable[TK421]
-
-
-RUF102 [*] Invalid rule code in suppression: TK421
-   --> suppressions.py:104:5
-    |
-102 |     # ruff: disable[TK421]
-103 |     print("hello")
-104 |     # ruff: enable[TK421]
-    |     ^^^^^^^^^^^^^^^^^^^^^
-    |
-help: Remove the rule code
-101 |     # External rule codes should be ignored
-102 |     # ruff: disable[TK421]
-103 |     print("hello")
-    -     # ruff: enable[TK421]

crates/ruff_linter/src/suppression.rs

@@ -18,9 +18,10 @@ use crate::checkers::ast::LintContext;
 use crate::codes::Rule;
 use crate::fix::edits::delete_comment;
 use crate::preview::is_range_suppressions_enabled;
+use crate::rule_redirects::get_redirect_target;
 use crate::rules::ruff::rules::{
     InvalidRuleCode, InvalidRuleCodeKind, InvalidSuppressionComment, InvalidSuppressionCommentKind,
-    UnmatchedSuppressionComment, UnusedCodes, UnusedNOQA, UnusedNOQAKind,
+    UnmatchedSuppressionComment, UnusedCodes, UnusedNOQA, UnusedNOQAKind, code_is_valid,
 };
 use crate::settings::LinterSettings;
 
@@ -154,7 +155,9 @@ impl Suppressions {
         };
 
         for suppression in &self.valid {
-            if *code == suppression.code.as_str() && suppression.range.contains_range(range) {
+            let suppression_code =
+                get_redirect_target(suppression.code.as_str()).unwrap_or(suppression.code.as_str());
+            if *code == suppression_code && suppression.range.contains_range(range) {
                 suppression.used.set(true);
                 return true;
             }
@@ -220,11 +223,9 @@ impl Suppressions {
         }
 
         if context.is_rule_enabled(Rule::InvalidRuleCode) {
-            for suppression in self
-                .valid
-                .iter()
-                .filter(|suppression| Rule::from_code(&suppression.code).is_err())
-            {
+            for suppression in self.valid.iter().filter(|suppression| {
+                !code_is_valid(&suppression.code, &context.settings().external)
+            }) {
                 for comment in &suppression.comments {
                     let (range, edit) =
                         Suppressions::delete_code_or_comment(locator, suppression, comment);