[509] Fix a formatting issue if a member attribute macro is applied to properties that already have an attribute #2105
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
…erties that already have an attribute
If a variable already had a macro already had an attribute and we add a new attribute to it via a member macro, the produced code was invalid. For example,
```swift
@wrapStoredProperties
struct Foo {
@available(*, deprecated) var x: Int
}
```
produced
```swift
struct Foo {
@available(*, deprecated)
@Wrappervar x: Int
}
```
which is invalid because there is no space between `Wrapper` and `var`.
To fix this, transfer the trailing trivia from the last attribute to the last newly inserted attribute.
This way, we essentially insert the new attributes right after the last attribute in source, but before its trailing trivia, keeping the trivia that separates the attribute block from the variable itself.
```swift
struct Foo {
@available(*, deprecated)
@wrapper var x: Int
}
```
rdar://114275860
|
Local testing passed ✅ |
bnbarham
approved these changes
Aug 24, 2023
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.
If a variable already had a macro already had an attribute and we add a new attribute to it via a member macro, the produced code was invalid. For example,
produced
which is invalid because there is no space between
Wrapperandvar.To fix this, transfer the trailing trivia from the last attribute to the last newly inserted attribute.
This way, we essentially insert the new attributes right after the last attribute in source, but before its trailing trivia, keeping the trivia that separates the attribute block from the variable itself.
rdar://114275860