[flake8-pyi] Improve autofix for nested and mixed type unions unnecessary-type-union (PYI055)
#14272
+237
−136
Conversation
This file contains 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
…cessary-type-union` (`PYI055`)
|
AlexWaygood
added
rule
This was referenced Nov 11, 2024
[
flake8-pyi] Implement autofix and handle nested unions with single element (PYI041 , PYI055)
#14214
Closed
sbrugman
commented
Nov 11, 2024
crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs
Outdated
Show resolved
Hide resolved
MichaReiser
requested changes
Nov 12, 2024
crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs
Outdated
Show resolved
Hide resolved
| ))); | ||
| } | ||
| // Mark [`Fix`] as unsafe when comments are in range. | ||
| let applicability = if checker.comment_ranges().intersects(union.range()) { |
There was a problem hiding this comment.
Hmm, I looked through all the intersects usages and I only found one exception where we set Applicability::Unsafe if the node contains comments. All other usages don't offer a fix instead. I think we should do the same here.
Could you take a look if we should use has_comments instead?
There was a problem hiding this comment.
has_comments is just wrapping intersects that includes leading and trailing content.
For type annotations I cannot come up with a case where the fix is changing the leading/trailing content:
a: ( # comment 1
- type[int] | type[float] ) = 3
+ type[int | float] ) = 3I'm not absolutely sure though.
MichaReiser
approved these changes
Nov 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This PR improves the fix for
PYI055to be able to handle nested and mixed type unions.It also marks the fix as unsafe when comments are present.
Test Plan