Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Target the diagnostic at the code even if only one code in comment

This commit is contained in:
Amethyst Reese 2025-12-11 17:06:05 -08:00
parent 2517430738
commit 3c8cd30a35
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__range_suppressions.snap
View File

@ -291,12 +291,12 @@ help: Remove invalid suppression comment
RUF100 [*] Unused suppression (non-enabled: `E501`) RUF100 [*] Unused suppression (non-enabled: `E501`)
--> suppressions.py:46:5 --> suppressions.py:46:21
| |
44 | # Neither of these are ignored and warnings are 44 | # Neither of these are ignored and warnings are
45 | # logged to user 45 | # logged to user
46 | # ruff: disable[E501] 46 | # ruff: disable[E501]
| ^^^^^^^^^^^^^^^^^^^^^ | ^^^^
47 | I = 1 47 | I = 1
48 | # ruff: enable[E501] 48 | # ruff: enable[E501]
| |
@ -311,12 +311,12 @@ help: Remove unused suppression
RUF100 [*] Unused suppression (non-enabled: `E501`) RUF100 [*] Unused suppression (non-enabled: `E501`)
--> suppressions.py:48:5 --> suppressions.py:48:20
| |
46 | # ruff: disable[E501] 46 | # ruff: disable[E501]
47 | I = 1 47 | I = 1
48 | # ruff: enable[E501] 48 | # ruff: enable[E501]
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^
| |
help: Remove unused suppression help: Remove unused suppression
45 | # logged to user 45 | # logged to user
@ -403,12 +403,12 @@ RUF104 Unmatched suppression comment
RUF100 [*] Unused suppression (unused: `F841`) RUF100 [*] Unused suppression (unused: `F841`)
--> suppressions.py:69:5 --> suppressions.py:69:21
| |
67 | # and the other should trigger an unused suppression diagnostic 67 | # and the other should trigger an unused suppression diagnostic
68 | # ruff: disable[F841] 68 | # ruff: disable[F841]
69 | # ruff: disable[F841] 69 | # ruff: disable[F841]
| ^^^^^^^^^^^^^^^^^^^^^ | ^^^^
70 | foo = 0 70 | foo = 0
| |
help: Remove unused suppression help: Remove unused suppression
@ -575,12 +575,12 @@ help: Remove unused suppression
RUF102 [*] Invalid rule code in `# noqa`: YF829 RUF102 [*] Invalid rule code in `# noqa`: YF829
--> suppressions.py:93:5 --> suppressions.py:93:21
| |
91 | def f(): 91 | def f():
92 | # Unknown rule codes 92 | # Unknown rule codes
93 | # ruff: disable[YF829] 93 | # ruff: disable[YF829]
| ^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^
94 | # ruff: disable[F841, RQW320] 94 | # ruff: disable[F841, RQW320]
95 | value = 0 95 | value = 0
| |
@ -634,12 +634,12 @@ help: Remove the rule code
RUF102 [*] Invalid rule code in `# noqa`: YF829 RUF102 [*] Invalid rule code in `# noqa`: YF829
--> suppressions.py:97:5 --> suppressions.py:97:20
| |
95 | value = 0 95 | value = 0
96 | # ruff: enable[F841, RQW320] 96 | # ruff: enable[F841, RQW320]
97 | # ruff: enable[YF829] 97 | # ruff: enable[YF829]
| ^^^^^^^^^^^^^^^^^^^^^ | ^^^^^
| |
help: Remove the rule code help: Remove the rule code
94 | # ruff: disable[F841, RQW320] 94 | # ruff: disable[F841, RQW320]

3
crates/ruff_linter/src/suppression.rs
View File

@ -288,8 +288,9 @@ impl Suppressions {
suppression: &Suppression, suppression: &Suppression,
comment: &SuppressionComment, comment: &SuppressionComment,
) -> (TextRange, Edit) { ) -> (TextRange, Edit) {
let mut range = comment.range; let range: TextRange;
let edit = if comment.codes.len() == 1 { let edit = if comment.codes.len() == 1 {
range = comment.codes[0];
delete_comment(comment.range, locator) delete_comment(comment.range, locator)
} else { } else {
let code_index = comment let code_index = comment