Move flake8-fixme rules to FIX prefix (#4917)

charliermarsh · web-flow · commit 20240fc3d920 · 2023-06-07T21:14:49.000Z
diff --git a/crates/ruff/src/registry.rs b/crates/ruff/src/registry.rs
@@ -159,7 +159,7 @@ pub enum Linter {
     #[prefix = "TD"]
     Flake8Todos,
     /// [flake8-fixme](https://github.com/tommilligan/flake8-fixme)
-    #[prefix = "T"]
+    #[prefix = "FIX"]
     Flake8Fixme,
     /// [eradicate](https://pypi.org/project/eradicate/)
     #[prefix = "ERA"]
diff --git a/crates/ruff/src/rule_redirects.rs b/crates/ruff/src/rule_redirects.rs
@@ -94,5 +94,9 @@ static REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
         ("RUF004", "B026"),
         ("PIE802", "C419"),
         ("PLW0130", "B033"),
+        ("T001", "FIX001"),
+        ("T002", "FIX002"),
+        ("T003", "FIX003"),
+        ("T004", "FIX004"),
     ])
 });
diff --git a/crates/ruff/src/rules/flake8_fixme/rules/todos.rs b/crates/ruff/src/rules/flake8_fixme/rules/todos.rs
@@ -43,13 +43,13 @@ pub(crate) fn todos(directive_ranges: &[TodoComment]) -> Vec<Diagnostic> {
     directive_ranges
         .iter()
         .map(|TodoComment { directive, .. }| match directive.kind {
-            // T-001
+            // FIX001
             TodoDirectiveKind::Fixme => Diagnostic::new(LineContainsFixme, directive.range),
-            // T-002
+            // FIX002
             TodoDirectiveKind::Hack => Diagnostic::new(LineContainsHack, directive.range),
-            // T-003
+            // FIX003
             TodoDirectiveKind::Todo => Diagnostic::new(LineContainsTodo, directive.range),
-            // T-004
+            // FIX004
             TodoDirectiveKind::Xxx => Diagnostic::new(LineContainsXxx, directive.range),
         })
         .collect::<Vec<Diagnostic>>()
diff --git a/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-fixme_T00.py.snap b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-fixme_T00.py.snap
@@ -1,21 +1,21 @@
 ---
 source: crates/ruff/src/rules/flake8_fixme/mod.rs
 ---
-T00.py:7:3: T001 Line contains FIXME
+T00.py:7:3: FIX001 Line contains FIXME
    |
  7 | # HACK: hack
  8 | # hack: hack
  9 | # FIXME: fixme
-   |   ^^^^^ T001
+   |   ^^^^^ FIX001
 10 | # fixme: fixme
    |
 
-T00.py:8:3: T001 Line contains FIXME
+T00.py:8:3: FIX001 Line contains FIXME
    |
  8 | # hack: hack
  9 | # FIXME: fixme
 10 | # fixme: fixme
-   |   ^^^^^ T001
+   |   ^^^^^ FIX001
    |
 
 
diff --git a/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-hack_T00.py.snap b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-hack_T00.py.snap
@@ -1,22 +1,22 @@
 ---
 source: crates/ruff/src/rules/flake8_fixme/mod.rs
 ---
-T00.py:5:3: T004 Line contains HACK
+T00.py:5:3: FIX004 Line contains HACK
   |
 5 | # XXX: xxx
 6 | # xxx: xxx
 7 | # HACK: hack
-  |   ^^^^ T004
+  |   ^^^^ FIX004
 8 | # hack: hack
 9 | # FIXME: fixme
   |
 
-T00.py:6:3: T004 Line contains HACK
+T00.py:6:3: FIX004 Line contains HACK
    |
  6 | # xxx: xxx
  7 | # HACK: hack
  8 | # hack: hack
-   |   ^^^^ T004
+   |   ^^^^ FIX004
  9 | # FIXME: fixme
 10 | # fixme: fixme
    |
diff --git a/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-todo_T00.py.snap b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-todo_T00.py.snap
@@ -1,19 +1,19 @@
 ---
 source: crates/ruff/src/rules/flake8_fixme/mod.rs
 ---
-T00.py:1:3: T002 Line contains TODO
+T00.py:1:3: FIX002 Line contains TODO
   |
 1 | # TODO: todo
-  |   ^^^^ T002
+  |   ^^^^ FIX002
 2 | # todo: todo
 3 | # XXX: xxx
   |
 
-T00.py:2:3: T002 Line contains TODO
+T00.py:2:3: FIX002 Line contains TODO
   |
 2 | # TODO: todo
 3 | # todo: todo
-  |   ^^^^ T002
+  |   ^^^^ FIX002
 4 | # XXX: xxx
 5 | # xxx: xxx
   |
diff --git a/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-xxx_T00.py.snap b/crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-xxx_T00.py.snap
@@ -1,22 +1,22 @@
 ---
 source: crates/ruff/src/rules/flake8_fixme/mod.rs
 ---
-T00.py:3:3: T003 Line contains XXX
+T00.py:3:3: FIX003 Line contains XXX
   |
 3 | # TODO: todo
 4 | # todo: todo
 5 | # XXX: xxx
-  |   ^^^ T003
+  |   ^^^ FIX003
 6 | # xxx: xxx
 7 | # HACK: hack
   |
 
-T00.py:4:3: T003 Line contains XXX
+T00.py:4:3: FIX003 Line contains XXX
   |
 4 | # todo: todo
 5 | # XXX: xxx
 6 | # xxx: xxx
-  |   ^^^ T003
+  |   ^^^ FIX003
 7 | # HACK: hack
 8 | # hack: hack
   |
diff --git a/crates/ruff/src/rules/flake8_todos/rules/todos.rs b/crates/ruff/src/rules/flake8_todos/rules/todos.rs
@@ -293,7 +293,7 @@ pub(crate) fn todos(
         }
 
         if !has_issue_link {
-            // TD-003
+            // TD003
             diagnostics.push(Diagnostic::new(MissingTodoLink, directive.range));
         }
     }
@@ -359,7 +359,7 @@ fn static_errors(
                 trimmed.text_len()
             }
         } else {
-            // TD-002
+            // TD002
             diagnostics.push(Diagnostic::new(MissingTodoAuthor, directive.range));
 
             TextSize::new(0)
@@ -368,18 +368,18 @@ fn static_errors(
     let after_author = &post_directive[usize::from(author_end)..];
     if let Some(after_colon) = after_author.strip_prefix(':') {
         if after_colon.is_empty() {
-            // TD-005
+            // TD005
             diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range));
         } else if !after_colon.starts_with(char::is_whitespace) {
-            // TD-007
+            // TD007
             diagnostics.push(Diagnostic::new(MissingSpaceAfterTodoColon, directive.range));
         }
     } else {
-        // TD-004
+        // TD004
         diagnostics.push(Diagnostic::new(MissingTodoColon, directive.range));
 
         if after_author.is_empty() {
-            // TD-005
+            // TD005
             diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range));
         }
     }
diff --git a/ruff.schema.json b/ruff.schema.json

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,21 @@`
`1`	`1`	`---`
`2`	`2`	`source: crates/ruff/src/rules/flake8_fixme/mod.rs`
`3`	`3`	`---`
`4`		`-T00.py:7:3: T001 Line contains FIXME`
	`4`	`+T00.py:7:3: FIX001 Line contains FIXME`
`5`	`5`	`\|`
`6`	`6`	`7 \| # HACK: hack`
`7`	`7`	`8 \| # hack: hack`
`8`	`8`	`9 \| # FIXME: fixme`
`9`		`- \| ^^^^^ T001`
	`9`	`+ \| ^^^^^ FIX001`
`10`	`10`	`10 \| # fixme: fixme`
`11`	`11`	`\|`
`12`	`12`
`13`		`-T00.py:8:3: T001 Line contains FIXME`
	`13`	`+T00.py:8:3: FIX001 Line contains FIXME`
`14`	`14`	`\|`
`15`	`15`	`8 \| # hack: hack`
`16`	`16`	`9 \| # FIXME: fixme`
`17`	`17`	`10 \| # fixme: fixme`
`18`		`- \| ^^^^^ T001`
	`18`	`+ \| ^^^^^ FIX001`
`19`	`19`	`\|`
`20`	`20`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`---`
`2`	`2`	`source: crates/ruff/src/rules/flake8_fixme/mod.rs`
`3`	`3`	`---`
`4`		`-T00.py:1:3: T002 Line contains TODO`
	`4`	`+T00.py:1:3: FIX002 Line contains TODO`
`5`	`5`	`\|`
`6`	`6`	`1 \| # TODO: todo`
`7`		`- \| ^^^^ T002`
	`7`	`+ \| ^^^^ FIX002`
`8`	`8`	`2 \| # todo: todo`
`9`	`9`	`3 \| # XXX: xxx`
`10`	`10`	`\|`
`11`	`11`
`12`		`-T00.py:2:3: T002 Line contains TODO`
	`12`	`+T00.py:2:3: FIX002 Line contains TODO`
`13`	`13`	`\|`
`14`	`14`	`2 \| # TODO: todo`
`15`	`15`	`3 \| # todo: todo`
`16`		`- \| ^^^^ T002`
	`16`	`+ \| ^^^^ FIX002`
`17`	`17`	`4 \| # XXX: xxx`
`18`	`18`	`5 \| # xxx: xxx`
`19`	`19`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ pub(crate) fn todos(`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`if !has_issue_link {`
`296`		`- // TD-003`
	`296`	`+ // TD003`
`297`	`297`	`diagnostics.push(Diagnostic::new(MissingTodoLink, directive.range));`
`298`	`298`	`}`
`299`	`299`	`}`
`@@ -359,7 +359,7 @@ fn static_errors(`
`359`	`359`	`trimmed.text_len()`
`360`	`360`	`}`
`361`	`361`	`} else {`
`362`		`- // TD-002`
	`362`	`+ // TD002`
`363`	`363`	`diagnostics.push(Diagnostic::new(MissingTodoAuthor, directive.range));`
`364`	`364`
`365`	`365`	`TextSize::new(0)`
`@@ -368,18 +368,18 @@ fn static_errors(`
`368`	`368`	`let after_author = &post_directive[usize::from(author_end)..];`
`369`	`369`	`if let Some(after_colon) = after_author.strip_prefix(':') {`
`370`	`370`	`if after_colon.is_empty() {`
`371`		`- // TD-005`
	`371`	`+ // TD005`
`372`	`372`	`diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range));`
`373`	`373`	`} else if !after_colon.starts_with(char::is_whitespace) {`
`374`		`- // TD-007`
	`374`	`+ // TD007`
`375`	`375`	`diagnostics.push(Diagnostic::new(MissingSpaceAfterTodoColon, directive.range));`
`376`	`376`	`}`
`377`	`377`	`} else {`
`378`		`- // TD-004`
	`378`	`+ // TD004`
`379`	`379`	`diagnostics.push(Diagnostic::new(MissingTodoColon, directive.range));`
`380`	`380`
`381`	`381`	`if after_author.is_empty() {`
`382`		`- // TD-005`
	`382`	`+ // TD005`
`383`	`383`	`diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range));`
`384`	`384`	`}`
`385`	`385`	`}`