E501/W505/formatter: Exclude nested pragma comments from line width calculation #24071
Merged
MichaReiser merged 2 commits intoastral-sh:mainfrom Mar 24, 2026
Merged
Conversation
bb536e4 to
c0ec5a7
Compare
c0ec5a7 to
da0d934
Compare
E501/W505/formatter: Exclude nested pragma comments from line width calculation
carljm
added a commit
that referenced
this pull request
Mar 25, 2026
* main: [ty] Avoid eager TypedDict diagnostics in `TypedDict | dict` unions (#24151) `F507`: Fix false negative for non-tuple RHS in `%`-formatting (#24142) [ty] Update `SpecializationBuilder` hook to get both lower/upper bounds (#23848) Fix `%foo?` parsing in IPython assignment expressions (#24152) `E501`/`W505`/formatter: Exclude nested pragma comments from line width calculation (#24071) [ty] Fix Salsa panic propagation (#24141) [ty] Support `type:ignore[ty:code]` suppressions (#24096) [ty] Support narrowing for extended walrus targets (#24129)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #18470
Summary
E501/W505): when a pragma (# noqa,# type: ignore, etc) follows another comment on the same line (like# comment # noqa: F401or## noqa), only the pragma suffix is stripped before measuring line length, so the pragma no longer causes false line-too-long violations.find_trailing_pragma_offset()toruff_python_triviathat finds the byte offset where a trailing pragma starts within a comment.is_pragma_comment()left unchanged.Changes to both linter and formatter are gated behind preview via new
is_trailing_pragma_in_line_length_enabledcheck.Test Plan
E501_5.pywith preview test cases for nested pragmas (# comment #noqa,## noqa,# comment # type: ignore)trailing_pragma_nested.pydemonstrating stable vs preview reserved width behaviorfind_trailing_pragma_offsetinpragmas.rs