[6.2] SwiftFixIt: Skip duplicate insertion fix-its #8915
Merged
Conversation
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
There are various scenarios — most notably involving protocol
compositions — where multiple different sites are diagnosed with the
same insertion fix-it. For example, compiling the following code with
`-enable-upcoming-feature InferIsolatedConformances:migrate` generates 2
warnings with equal fix-its for prepending `nonisolated` to the
composition:
```swift
protocol P {}
protocol Q {}
@mainactor struct S: P & Q {}
```
Applying both fix-its will produce invalid code:
`@MainActor struct S: nonisolated nonisolated P & Q {}`.
(cherry picked from commit 9034e62)
(cherry picked from commit f8db3a9)
AnthonyLatsis
requested review from
bnbarham,
xedin,
jakepetroules,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
bnbarham
approved these changes
Jul 9, 2025
|
@swift-ci please test |
owenv
approved these changes
Jul 9, 2025
|
@swift-ci please test Windows |
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.
Explanation:
There are various scenarios — most notably involving protocol compositions — where multiple different sites are diagnosed with the same insertion fix-it. For example, compiling the following code with
-enable-upcoming-feature InferIsolatedConformances:migrategenerates 2 warnings with equal fix-its for prependingnonisolatedto the composition:Applying both fix-its will produce invalid code:
@MainActor struct S: nonisolated nonisolated P & Q {}.Scope:
swift package migrate.Issues: —
Original PRs: SwiftFixIt: Skip duplicate insertion fix-its #8892
Risk: Low.
Testing: Added regression tests.
Reviewers: @xedin @dschaefer2