Fix issue that caused AccessorDeclSyntax initializer with header + body to be misparsed
#2739
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
|
@swift-ci Please test |
rintaro
reviewed
Jul 20, 2024
| stringInterpolation.appendInterpolation(header) | ||
| stringInterpolation.appendLiteral(" {}") | ||
| if let parsableType = Self.self as? SyntaxParseable.Type { | ||
| decl = parsableType.init(stringInterpolation: stringInterpolation).cast(DeclSyntax.self) |
There was a problem hiding this comment.
I think upcasting here and down casting again below is a waste. Instead of branching in where Self: DeclSyntaxProtocol extension, how about making where Self: SyntaxParseable separately?
extension WithOptionalCodeBlockSyntax where Self: SyntaxParseable & DeclSyntaxProtocol {
public init(
_ header: SyntaxNodeString,
@CodeBlockItemListBuilder bodyBuilder: () throws -> CodeBlockItemListSyntax
) throws {
self = "\(header) {}"
self.body = try CodeBlockSyntax(statements: bodyBuilder()))
}
}(& DeclSyntaxProtocol is for resolving ambiguity)
There was a problem hiding this comment.
Discussed offline and kept the current implementation + added a comment why we need to manually construct the string interpolation.
…body to be misparsed
`get {}` was parsed by `Parser.parseDeclaration()` but it doesn't parse accessors.
`AccessorDeclSyntax` needs a special implementation of `init(header:bodyBuilder:)`.
rdar://131720084
ahoppen
force-pushed
the
accessor-decl-header-initializer
branch
from
c40123f to
81091c1
Compare
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
rintaro
approved these changes
Jul 24, 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.
get {}was parsed byParser.parseDeclaration()but it doesn't parse accessors.AccessorDeclSyntaxneeds a special implementation ofinit(header:bodyBuilder:).rdar://131720084