Skip to content

Fix dedent with multiple leading comments - #29382

Merged
ntBre merged 3 commits into
astral-sh:mainfrom
mmaxjr:fix/29381-dedent-comments
Oct 14, 2026
Merged

Fix dedent with multiple leading comments#29382
ntBre merged 3 commits into
astral-sh:mainfrom
mmaxjr:fix/29381-dedent-comments

Conversation

@mmaxjr

@mmaxjr mmaxjr commented Oct 14, 2026 •
edited by ntBre
Loading

Copy link
Copy Markdown
Contributor

Fix unsafe dedent behavior when multiple leading comments are present. Added regression coverage for the affected indentation cases.

Fixes #29381.

@ntBre

ntBre commented Oct 14, 2026

Copy link
Copy Markdown
Contributor

Is this related to an open issue?

@mmaxjr

mmaxjr commented Oct 14, 2026

Copy link
Copy Markdown
Contributor Author

Yes. This PR addresses issue #29381, which reports incorrect indentation in safe fixes when the else body starts with multiple comments.

@ntBre ntBre linked an issue Oct 14, 2026 that may be closed by this pull request
Safe fixes for RET505–RET508 and PLW0120 mis-indent an else body that starts with two or more comments #29381
Closed
@ntBre ntBre added the bug An issue describing something that isn't working, or a PR that fixes a bug label Oct 14, 2026
@astral-sh-bot

astral-sh-bot Bot commented Oct 14, 2026

Copy link
Copy Markdown

ruff-ecosystem results

Linter (stable)

✅ ecosystem check detected no linter changes.

Linter (preview)

✅ ecosystem check detected no linter changes.

Formatter (stable)

✅ ecosystem check detected no format changes.

Formatter (preview)

✅ ecosystem check detected no format changes.

ntBre
ntBre approved these changes Oct 14, 2026
View reviewed changes

@ntBre ntBre left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@ntBre ntBre changed the title [trivia] Fix dedent with multiple leading comments Fix dedent with multiple leading comments Oct 14, 2026
@ntBre
ntBre enabled auto-merge (squash) October 14, 2026 19:37
@ntBre
ntBre merged commit 83a3afc into astral-sh:main Oct 14, 2026
63 of 64 checks passed
@BrewTestBot BrewTestBot mentioned this pull request Oct 15, 2026
Merged
@github-actions github-actions Bot mentioned this pull request Nov 2, 2026
Merged
1 task
This was referenced Nov 8, 2026
Open
Open
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ntBre ntBre ntBre approved these changes

Assignees

No one assigned

Labels

bug An issue describing something that isn't working, or a PR that fixes a bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Safe fixes for RET505–RET508 and PLW0120 mis-indent an else body that starts with two or more comments

2 participants

@mmaxjr @ntBre