Report diagnostics for invalid/unmatched range suppression comments by amyreese · Pull Request #21908 · astral-sh/ruff

amyreese · 2025-12-10T23:21:31Z

Summary

Adds new RUF103 and RUF104 diagnostics for invalid and unmatched suppression comments
Reports RUF104 diagnostics for any unmatched suppression comment

Test Plan

Updated snapshots from test cases with unmatched suppression comments

Issue #3711
Fixes #21878
Fixes #21875

astral-sh-bot · 2025-12-10T23:30:21Z

`ruff-ecosystem` results

Linter (stable)

✅ ecosystem check detected no linter changes.

Linter (preview)

✅ ecosystem check detected no linter changes.

MichaReiser · 2025-12-11T08:40:32Z

Uff, ruff: isort 😆

## Summary Ignores `#ruff:isort` when parsing suppressions similar to `#ruff:noqa`. Should clear up ecosystem issues in #21908 ## Test Plan cargo tests

MichaReiser

Overall this looks good. A few more smaller suggestions

crates/ruff_linter/resources/test/fixtures/ruff/suppressions.py

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

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

...uff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__range_suppressions.snap

crates/ruff_linter/src/suppression.rs

MichaReiser · 2025-12-12T09:16:56Z

crates/ruff_linter/src/suppression.rs

+                        },
+                        range,
+                    );
+                    diagnostic.set_fix(Fix::safe_edit(edit));


Does noqa offer a fix if the rule code is invalid? Removing is one possible solution but the user might also have misspelled the rule name and the proper fix is to fix the rule name instead.

Yes, the noqa implementation does a range deletion of either the entire comment or the individual invalid code, and also marks those as safe edits.

MichaReiser · 2025-12-12T09:18:14Z

crates/ruff_linter/src/suppression.rs

+                    suppression.comments.len() == 1
+                        && suppression.comments[0].action == SuppressionAction::Disable


I think this is another case where I'd prefer to have dedicated enable and disable fields on Suppression. It would remove the need for code like this to "poke" into the internals.

crates/ruff_linter/src/suppression.rs

...uff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__range_suppressions.snap

ntBre

Nice! Just a couple of small things from me beyond Micha's comments.

This is a bit off topic, and I'm not sure if y'all have discussed this (or already implemented it?), but I was thinking it would be nice to have a code action to wrap the selected region with these comments, like we have for adding a noqa comment.

ntBre · 2025-12-12T19:37:16Z

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

+/// ## References
+/// - [Ruff error suppression](https://docs.astral.sh/ruff/linter/#error-suppression)
+#[derive(ViolationMetadata)]
+#[violation_metadata(preview_since = "0.14.9")]


We'll have to bump these after the release this week.

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

crates/ruff_linter/src/suppression.rs

MichaReiser · 2025-12-12T20:06:21Z

This is a bit off topic, and I'm not sure if y'all have discussed this (or already implemented it?), but I was thinking it would be nice to have a code action to wrap the selected region with these comments, like we have for adding a noqa comment.

I think this is trickier because the main use case is to suppress multiple statements. It still recommended to use noqa for local suppressions.

Showing too many code actions is also noisy, which is why I wouldn't implement this for now

…mment" This reverts commit 3c8cd30.

amyreese · 2025-12-17T02:24:41Z

Checkpointing the feedback I got to today.

amyreese · 2025-12-18T02:12:17Z

Reorganized the logic to reduce repeat iterations and only consider each suppression for one type of violation at a time (I think that's what Micha was getting at?). I'd like to leave consolidating the diagnostics and any other refactors/structural changes to follow-up PRs.

MichaReiser

A few more nits about which diagnostics we emit but this otherwise looks good.

...uff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__range_suppressions.snap

MichaReiser · 2025-12-18T10:15:36Z

...uff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__range_suppressions.snap

+94 |     # ruff: disable[F841, RQW320]
+95 |     value = 0
+   |
+help: Remove the rule code


Maybe: Remove the suppression comment if all codes are invalid

Changing this would also change the help text for all #noqa directives as well. Should that happen in a separate PR?

Yeah, maybe

crates/ruff_linter/src/suppression.rs

Missed including this in the follow-up on #21908

amyreese added 2 commits December 10, 2025 12:53

Define rule codes RUF103/104 for invalid/unmatched suppression comments

90f82c1

Report RUF104 unmatched suppression diagnostics

976a52c

amyreese force-pushed the amy/unmatched-suppressions branch from 282450e to 7e9def9 Compare December 10, 2025 23:29

amyreese added 2 commits December 10, 2025 17:10

Report invalid suppression diagnostics

05f63c9

Todos

aa91353

amyreese mentioned this pull request Dec 11, 2025

Document range suppressions, reorganize suppression docs #21884

Merged

amyreese changed the title ~~Report diagnostics for unmatched range suppression comments~~ Report diagnostics for invalid/unmatched range suppression comments Dec 11, 2025

amyreese mentioned this pull request Dec 11, 2025

Ignore ruff:isort like ruff:noqa in new suppressions #21922

Merged

amyreese added a commit that referenced this pull request Dec 11, 2025

Ignore ruff:isort like ruff:noqa in new suppressions (#21922)

7a578ce

## Summary Ignores `#ruff:isort` when parsing suppressions similar to `#ruff:noqa`. Should clear up ecosystem issues in #21908 ## Test Plan cargo tests

amyreese added 6 commits December 11, 2025 15:05

Fix test cases causing panics

ebf0121

Move rule-enabled checks to local logic, extract some bits

2b6dc03

Generate invalid rule code diagnostics

bcd9374

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

58f5734

clippy

4793f52

Document that implicit ranges will produce RUF104

c50026e

amyreese force-pushed the amy/unmatched-suppressions branch from 100ed3f to 999a481 Compare December 12, 2025 01:25

amyreese marked this pull request as ready for review December 12, 2025 01:26

amyreese requested review from MichaReiser and ntBre December 12, 2025 01:26

MichaReiser added rule Implementing or modifying a lint rule preview Related to preview mode features labels Dec 12, 2025

MichaReiser reviewed Dec 12, 2025

View reviewed changes

ntBre reviewed Dec 12, 2025

View reviewed changes

amyreese added 4 commits December 16, 2025 15:20

Add test case covering external rules

a6e9ca8

Correct pub usage

6cee82d

Improve documentation for unmatched diagnostic

5b7d82b

Mark invalid comment diagnostics as unsafe fixes

b659b5b

amyreese added 4 commits December 16, 2025 16:36

Update test snapshots

83706a9

update wording in invalid rule code diagnostics

5c112af

Revert "Target the diagnostic at the code even if only one code in co…

0f3c74f

…mment" This reverts commit 3c8cd30.

Avoid unnecessary assignments

f5532ff

amyreese added 2 commits December 17, 2025 10:56

Use itertools unique

ea17270

Handle external codes and redirects

b90f418

amyreese mentioned this pull request Dec 17, 2025

[feature request] Support ignore block of code with noqa #3711

Closed

2 tasks

Reorganize check_suppressions to iterate over valid/errors only once

5bdf049

amyreese force-pushed the amy/unmatched-suppressions branch from 8a54e01 to 5bdf049 Compare December 18, 2025 01:12

amyreese added 2 commits December 17, 2025 17:19

clippy

0548374

Fix docs

bafc629

amyreese requested review from MichaReiser and ntBre December 18, 2025 02:12

MichaReiser approved these changes Dec 18, 2025

View reviewed changes

amyreese added 5 commits December 18, 2025 10:30

Only target the invalid rule code

a6c73ae

Treat missing codes as invalid suppression comment, update error message

0e8b8aa

Better implementation of highlighting only code for invalid rule codes

5f5bd05

More test cases, improve error/fix wording

b14a6ac

Update comment to clarify unused external codes

78e8594

amyreese merged commit 3d334a3 into main Dec 18, 2025
37 checks passed

amyreese deleted the amy/unmatched-suppressions branch December 18, 2025 20:58

amyreese mentioned this pull request Dec 18, 2025

[ruff] fix preview-since values for RUF103 and RUF104 #22061

Merged

amyreese added a commit that referenced this pull request Dec 18, 2025

[ruff] fix preview-since values for RUF103 and RUF104 (#22061)

b7fbd98

Missed including this in the follow-up on #21908

BrewTestBot mentioned this pull request Jan 8, 2026

ruff 0.14.11 Homebrew/homebrew-core#261902

Merged

		suppression.comments.len() == 1
		&& suppression.comments[0].action == SuppressionAction::Disable

Conversation

amyreese commented Dec 10, 2025 • edited by MichaReiser Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test Plan

Uh oh!

astral-sh-bot bot commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ruff-ecosystem results

Linter (stable)

Linter (preview)

Uh oh!

MichaReiser commented Dec 11, 2025

Uh oh!

MichaReiser left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MichaReiser Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

amyreese Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

MichaReiser Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ntBre left a comment

Choose a reason for hiding this comment

Uh oh!

ntBre Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MichaReiser commented Dec 12, 2025

Uh oh!

amyreese commented Dec 17, 2025

Uh oh!

amyreese commented Dec 18, 2025

Uh oh!

MichaReiser left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

MichaReiser Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

amyreese Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

MichaReiser Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

amyreese commented Dec 10, 2025 •

edited by MichaReiser

Loading

astral-sh-bot bot commented Dec 10, 2025 •

edited

Loading

`ruff-ecosystem` results