Allow trailing commas in macro role attribute arguments#3361
Open
nenadvulic wants to merge 1 commit into
Open
Conversation
parseMacroRoleArguments passed allowTrailingComma: false, unlike the custom-attribute argument path. SE-0439 generalized trailing commas to these comma-separated lists, so a trailing comma in e.g. @attached(member, names: named(foo),) should parse cleanly. Fixes swiftlang#3306.
nenadvulic
requested review from
ahoppen,
hamishknight,
hborla and
rintaro
as code owners
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #3306.
parseMacroRoleArgumentsparsed its argument list withallowTrailingComma: false, even though the equivalent custom-attribute path already usesallowTrailingComma: true. As the issue notes, SE-0439 generalized trailing commas to comma-separated lists like these, and to the user (and in the AST) macro role arguments are a regularLabeledExprListSyntax. Thefalselooks like an oversight from when trailing-comma support was rolled out (enabled for custom attributes but not for macro role attributes).Change
Sources/SwiftParser/Attributes.swift:parseMacroRoleArgumentsnow passesallowTrailingComma: true, matching the custom-attribute argument path.Test
Tests/SwiftParserTest/TrailingCommaTests.swift: addedtestMacroRoleAttributes, mirroring the existingtestCustomAttributes, covering@attached(...)and@freestanding(...)with a trailing comma.Verified the test fails before the change (
expected value in attribute) and passes after.TrailingCommaTests,AttributeTests, andDeclarationTestsall pass with no regressions.