Skip to content

Ensure pending suppression diagnostics are reported #23242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amyreese merged 3 commits into from
Feb 12, 2026
Merged

Ensure pending suppression diagnostics are reported #23242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12f11d5
Ensure pending suppression diagnostics are registered
amyreese Feb 12, 2026
8f1dfcb
add test case
amyreese Feb 12, 2026
6d68c59
is none or
amyreese Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions crates/ruff_linter/resources/test/fixtures/ruff/suppressions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,10 @@ def f():
# ruff: disable
# ruff: disable[]
print("hello")


# Ensure LAST suppression in file is reported.
# https://github.com/astral-sh/ruff/issues/23235
# ruff:disable[F401]
print("goodbye")
# ruff:enable[F401]
22 changes: 22 additions & 0 deletions ..._linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__range_suppressions.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ help: Remove suppression comment
- # ruff: disable
109 | # ruff: disable[]
110 | print("hello")
111 |
note: This is an unsafe fix and may change runtime behavior

RUF103 [*] Invalid suppression comment: missing suppression codes like `[E501, ...]`
Expand All @@ -399,4 +400,25 @@ help: Remove suppression comment
109 | # ruff: disable
- # ruff: disable[]
110 | print("hello")
111 |
112 |
note: This is an unsafe fix and may change runtime behavior

RUF100 [*] Unused suppression (non-enabled: `F401`)
--> suppressions.py:116:1
|
114 | # Ensure LAST suppression in file is reported.
115 | # https://github.com/astral-sh/ruff/issues/23235
116 | # ruff:disable[F401]
| ^^^^^^^^^^^^^^^^^^^^
117 | print("goodbye")
118 | # ruff:enable[F401]
| -------------------
|
help: Remove unused suppression
113 |
114 | # Ensure LAST suppression in file is reported.
115 | # https://github.com/astral-sh/ruff/issues/23235
- # ruff:disable[F401]
116 | print("goodbye")
- # ruff:enable[F401]
115 changes: 64 additions & 51 deletions crates/ruff_linter/src/suppression.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,60 +222,71 @@ impl Suppressions {
pub(crate) fn check_suppressions(&self, context: &LintContext, locator: &Locator) {
let mut grouped_diagnostic: Option<(TextRange, SuppressionDiagnostic)> = None;
let mut unmatched_ranges = FxHashSet::default();

let process_pending_diagnostics =
|key: Option<TextRange>,
grouped_diagnostic: &Option<(TextRange, SuppressionDiagnostic)>|
-> bool {
if let Some((group_key, group)) = grouped_diagnostic
&& key.is_none_or(|key| key != *group_key)
{
if group.any_invalid() {
Suppressions::report_suppression_codes(
context,
locator,
group.suppression,
&group.invalid_codes,
true,
InvalidRuleCode {
rule_code: group.invalid_codes.iter().join(", "),
kind: InvalidRuleCodeKind::Suppression,
whole_comment: group.suppression.codes().len()
== group.invalid_codes.len(),
},
);
}
if group.any_unused() {
let mut codes = group.disabled_codes.clone();
codes.extend(group.unused_codes.clone());
Suppressions::report_suppression_codes(
context,
locator,
group.suppression,
&codes,
false,
UnusedNOQA {
codes: Some(UnusedCodes {
disabled: group
.disabled_codes
.iter()
.map(ToString::to_string)
.collect_vec(),
duplicated: group
.duplicated_codes
.iter()
.map(ToString::to_string)
.collect_vec(),
unmatched: group
.unused_codes
.iter()
.map(ToString::to_string)
.collect_vec(),
..Default::default()
}),
kind: UnusedNOQAKind::Suppression,
},
);
}
true
} else {
false
}
};

for suppression in &self.valid {
let key = suppression.comments.disable_comment().range;

// Process any pending grouped diagnostics
if let Some((group_key, ref group)) = grouped_diagnostic
&& key != group_key
{
if group.any_invalid() {
Suppressions::report_suppression_codes(
context,
locator,
group.suppression,
&group.invalid_codes,
true,
InvalidRuleCode {
rule_code: group.invalid_codes.iter().join(", "),
kind: InvalidRuleCodeKind::Suppression,
whole_comment: group.suppression.codes().len()
== group.invalid_codes.len(),
},
);
}
if group.any_unused() {
let mut codes = group.disabled_codes.clone();
codes.extend(group.unused_codes.clone());
Suppressions::report_suppression_codes(
context,
locator,
group.suppression,
&codes,
false,
UnusedNOQA {
codes: Some(UnusedCodes {
disabled: group
.disabled_codes
.iter()
.map(ToString::to_string)
.collect_vec(),
duplicated: group
.duplicated_codes
.iter()
.map(ToString::to_string)
.collect_vec(),
unmatched: group
.unused_codes
.iter()
.map(ToString::to_string)
.collect_vec(),
..Default::default()
}),
kind: UnusedNOQAKind::Suppression,
},
);
}
if process_pending_diagnostics(Some(key), &grouped_diagnostic) {
grouped_diagnostic = None;
}

Expand Down Expand Up @@ -324,6 +335,8 @@ impl Suppressions {
}
}

process_pending_diagnostics(None, &grouped_diagnostic);

if context.is_rule_enabled(Rule::InvalidSuppressionComment) {
for error in &self.errors {
context
Expand Down