language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-27 04:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Charlie Marsh 2023-06-07 17:14:49 -04:00 • committed by GitHub
parent f990d9dcc5
commit 20240fc3d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ruff/src/registry.rs
View file

@ -159,7 +159,7 @@ pub enum Linter {
#[prefix = "TD"] #[prefix = "TD"]
Flake8Todos, Flake8Todos,
/// [flake8-fixme](https://github.com/tommilligan/flake8-fixme) /// [flake8-fixme](https://github.com/tommilligan/flake8-fixme)
#[prefix = "T"] #[prefix = "FIX"]
Flake8Fixme, Flake8Fixme,
/// [eradicate](https://pypi.org/project/eradicate/) /// [eradicate](https://pypi.org/project/eradicate/)
#[prefix = "ERA"] #[prefix = "ERA"]

4
crates/ruff/src/rule_redirects.rs
View file

@ -94,5 +94,9 @@ static REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
("RUF004", "B026"), ("RUF004", "B026"),
("PIE802", "C419"), ("PIE802", "C419"),
("PLW0130", "B033"), ("PLW0130", "B033"),
("T001", "FIX001"),
("T002", "FIX002"),
("T003", "FIX003"),
("T004", "FIX004"),
]) ])
}); });

8
crates/ruff/src/rules/flake8_fixme/rules/todos.rs
View file

@ -43,13 +43,13 @@ pub(crate) fn todos(directive_ranges: &[TodoComment]) -> Vec<Diagnostic> {
directive_ranges directive_ranges
.iter() .iter()
.map(|TodoComment { directive, .. }| match directive.kind { .map(|TodoComment { directive, .. }| match directive.kind {
// T-001 // FIX001
TodoDirectiveKind::Fixme => Diagnostic::new(LineContainsFixme, directive.range), TodoDirectiveKind::Fixme => Diagnostic::new(LineContainsFixme, directive.range),
// T-002 // FIX002
TodoDirectiveKind::Hack => Diagnostic::new(LineContainsHack, directive.range), TodoDirectiveKind::Hack => Diagnostic::new(LineContainsHack, directive.range),
// T-003 // FIX003
TodoDirectiveKind::Todo => Diagnostic::new(LineContainsTodo, directive.range), TodoDirectiveKind::Todo => Diagnostic::new(LineContainsTodo, directive.range),
// T-004 // FIX004
TodoDirectiveKind::Xxx => Diagnostic::new(LineContainsXxx, directive.range), TodoDirectiveKind::Xxx => Diagnostic::new(LineContainsXxx, directive.range),
}) })
.collect::<Vec<Diagnostic>>() .collect::<Vec<Diagnostic>>()

8
crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-fixme_T00.py.snap
View file

@ -1,21 +1,21 @@
--- ---
source: crates/ruff/src/rules/flake8_fixme/mod.rs 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 7 | # HACK: hack
8 | # hack: hack 8 | # hack: hack
9 | # FIXME: fixme 9 | # FIXME: fixme
| ^^^^^ T001 | ^^^^^ FIX001
10 | # fixme: fixme 10 | # fixme: fixme
| |
T00.py:8:3: T001 Line contains FIXME T00.py:8:3: FIX001 Line contains FIXME
| |
8 | # hack: hack 8 | # hack: hack
9 | # FIXME: fixme 9 | # FIXME: fixme
10 | # fixme: fixme 10 | # fixme: fixme
| ^^^^^ T001 | ^^^^^ FIX001
| |

8
crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-hack_T00.py.snap
View file

@ -1,22 +1,22 @@
--- ---
source: crates/ruff/src/rules/flake8_fixme/mod.rs 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 5 | # XXX: xxx
6 | # xxx: xxx 6 | # xxx: xxx
7 | # HACK: hack 7 | # HACK: hack
| ^^^^ T004 | ^^^^ FIX004
8 | # hack: hack 8 | # hack: hack
9 | # FIXME: fixme 9 | # FIXME: fixme
| |
T00.py:6:3: T004 Line contains HACK T00.py:6:3: FIX004 Line contains HACK
| |
6 | # xxx: xxx 6 | # xxx: xxx
7 | # HACK: hack 7 | # HACK: hack
8 | # hack: hack 8 | # hack: hack
| ^^^^ T004 | ^^^^ FIX004
9 | # FIXME: fixme 9 | # FIXME: fixme
10 | # fixme: fixme 10 | # fixme: fixme
| |

8
crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-todo_T00.py.snap
View file

@ -1,19 +1,19 @@
--- ---
source: crates/ruff/src/rules/flake8_fixme/mod.rs 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 1 | # TODO: todo
| ^^^^ T002 | ^^^^ FIX002
2 | # todo: todo 2 | # todo: todo
3 | # XXX: xxx 3 | # XXX: xxx
| |
T00.py:2:3: T002 Line contains TODO T00.py:2:3: FIX002 Line contains TODO
| |
2 | # TODO: todo 2 | # TODO: todo
3 | # todo: todo 3 | # todo: todo
| ^^^^ T002 | ^^^^ FIX002
4 | # XXX: xxx 4 | # XXX: xxx
5 | # xxx: xxx 5 | # xxx: xxx
| |

8
crates/ruff/src/rules/flake8_fixme/snapshots/ruff__rules__flake8_fixme__tests__line-contains-xxx_T00.py.snap
View file

@ -1,22 +1,22 @@
--- ---
source: crates/ruff/src/rules/flake8_fixme/mod.rs 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 3 | # TODO: todo
4 | # todo: todo 4 | # todo: todo
5 | # XXX: xxx 5 | # XXX: xxx
| ^^^ T003 | ^^^ FIX003
6 | # xxx: xxx 6 | # xxx: xxx
7 | # HACK: hack 7 | # HACK: hack
| |
T00.py:4:3: T003 Line contains XXX T00.py:4:3: FIX003 Line contains XXX
| |
4 | # todo: todo 4 | # todo: todo
5 | # XXX: xxx 5 | # XXX: xxx
6 | # xxx: xxx 6 | # xxx: xxx
| ^^^ T003 | ^^^ FIX003
7 | # HACK: hack 7 | # HACK: hack
8 | # hack: hack 8 | # hack: hack
| |

12
crates/ruff/src/rules/flake8_todos/rules/todos.rs
View file

@ -293,7 +293,7 @@ pub(crate) fn todos(
} }
if !has_issue_link { if !has_issue_link {
// TD-003 // TD003
diagnostics.push(Diagnostic::new(MissingTodoLink, directive.range)); diagnostics.push(Diagnostic::new(MissingTodoLink, directive.range));
} }
} }
@ -359,7 +359,7 @@ fn static_errors(
trimmed.text_len() trimmed.text_len()
} }
} else { } else {
// TD-002 // TD002
diagnostics.push(Diagnostic::new(MissingTodoAuthor, directive.range)); diagnostics.push(Diagnostic::new(MissingTodoAuthor, directive.range));
TextSize::new(0) TextSize::new(0)
@ -368,18 +368,18 @@ fn static_errors(
let after_author = &post_directive[usize::from(author_end)..]; let after_author = &post_directive[usize::from(author_end)..];
if let Some(after_colon) = after_author.strip_prefix(':') { if let Some(after_colon) = after_author.strip_prefix(':') {
if after_colon.is_empty() { if after_colon.is_empty() {
// TD-005 // TD005
diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range)); diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range));
} else if !after_colon.starts_with(char::is_whitespace) { } else if !after_colon.starts_with(char::is_whitespace) {
// TD-007 // TD007
diagnostics.push(Diagnostic::new(MissingSpaceAfterTodoColon, directive.range)); diagnostics.push(Diagnostic::new(MissingSpaceAfterTodoColon, directive.range));
} }
} else { } else {
// TD-004 // TD004
diagnostics.push(Diagnostic::new(MissingTodoColon, directive.range)); diagnostics.push(Diagnostic::new(MissingTodoColon, directive.range));
if after_author.is_empty() { if after_author.is_empty() {
// TD-005 // TD005
diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range)); diagnostics.push(Diagnostic::new(MissingTodoDescription, directive.range));
} }
} }

14
ruff.schema.json generated
View file

@ -1918,6 +1918,13 @@
"FBT001", "FBT001",
"FBT002", "FBT002",
"FBT003", "FBT003",
"FIX",
"FIX0",
"FIX00",
"FIX001",
"FIX002",
"FIX003",
"FIX004",
"FLY", "FLY",
"FLY0", "FLY0",
"FLY00", "FLY00",
@ -2408,13 +2415,6 @@
"SLF00", "SLF00",
"SLF001", "SLF001",
"T", "T",
"T",
"T0",
"T00",
"T001",
"T002",
"T003",
"T004",
"T1", "T1",
"T10", "T10",
"T100", "T100",