[Parser] Fix the fixit for protocol compositions' syntax change (3.0) #4486
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
…cing Protocol<A, B>. rdar://27992964 When migrating, we found our fixit to replace the old protocol composition syntax, namely "Protocol<A, B>", to the new syntax, "A & B", does not preserve the trailing content after '>'. For instance, we replace "Protocol<A, B>?" with "A & B". This patch fixes the issue by inserting whatever after '>' in the old syntax to the new replacement string. I consider this as a hack; the root-cause fix should be in the lexer to smartly separate '>' and '?' as two tokens instead of one.
|
@swift-ci Please test OS X platform |
|
This LGTM. Thanks for fixing this. |
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.
Protocol<A, B>, to the new syntax,A & B, does not preserve the trailing content after>. For instance, we replaceProtocol<A, B>?withA & B. This patch fixes the issue by inserting whatever after>in the old syntax to the new replacement string.Resolved bug number: (SR-)
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
A smoke test on macOS does the following:
device standard libraries are not built.
version of these tests are not run.
A smoke test on Linux does the following:
tests are not run.
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.