Skip to content

Implement trailing comma for comma-separated lists #74522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Aug 7, 2024
Merged

Implement trailing comma for comma-separated lists #74522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
013997d
Implement trailing comma for comma-separated lists
mateusrodriguesxyz Jun 18, 2024
fe0e683
Remove enum case list trailing comma support
mateusrodriguesxyz Jun 20, 2024
2e3b987
Update isStartOfConditionalStmtBody to check for oper_binary_unspaced
mateusrodriguesxyz Jun 27, 2024
e1f5371
Merge branch 'main' into trailing-comma
xwu Jun 29, 2024
e0d416c
Ungate accepted parts of SE439
mateusrodriguesxyz Jul 22, 2024
1cdf721
Remove flag from trailing comma tests and move experimental parts to …
mateusrodriguesxyz Jul 22, 2024
2ff7492
Update other tests to handle trailing comma
mateusrodriguesxyz Jul 22, 2024
e4ff484
Update trailing comma tests with array literal and built-in attributes
mateusrodriguesxyz Jul 24, 2024
9b47fd6
Remove disable-experimental-parser-round-trip from trailing comma tests
mateusrodriguesxyz Jul 25, 2024
b1ba769
Minor changes for better clarity
mateusrodriguesxyz Jul 25, 2024
e3f4228
Remove macro role trailing comma support
mateusrodriguesxyz Aug 5, 2024
ac57e61
Merge branch 'main' into trailing-comma
mateusrodriguesxyz Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/swift/Basic/Features.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,9 @@ EXPERIMENTAL_FEATURE(SE427NoInferenceOnExtension, true)

EXPERIMENTAL_FEATURE(Extern, true)

// Enable trailing comma for comma-separated lists.
EXPERIMENTAL_FEATURE(TrailingComma, false)

#undef EXPERIMENTAL_FEATURE_EXCLUDED_FROM_MODULE_INTERFACE
#undef EXPERIMENTAL_FEATURE
#undef UPCOMING_FEATURE
Expand Down
2 changes: 2 additions & 0 deletions include/swift/Parse/Parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1986,6 +1986,8 @@ class Parser {
/// expression can be parsed.
bool isStartOfStmt(bool preferExpr);

bool isStartOfConditionalStmtBody();

bool isTerminatorForBraceItemListKind(BraceItemListKind Kind,
ArrayRef<ASTNode> ParsedDecls);
ParserResult<Stmt> parseStmt(bool fromASTGen = false);
Expand Down
1 change: 1 addition & 0 deletions lib/AST/FeatureSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ UNINTERESTING_FEATURE(Sensitive)
UNINTERESTING_FEATURE(DebugDescriptionMacro)
UNINTERESTING_FEATURE(ReinitializeConsumeInMultiBlockDefer)
UNINTERESTING_FEATURE(SE427NoInferenceOnExtension)
UNINTERESTING_FEATURE(TrailingComma)

// ----------------------------------------------------------------------------
// MARK: - FeatureSet
Expand Down
1 change: 1 addition & 0 deletions lib/ASTGen/Sources/ASTGen/SourceFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ extension Parser.ExperimentalFeatures {
mapFeature(.DoExpressions, to: .doExpressions)
mapFeature(.NonescapableTypes, to: .nonescapableTypes)
mapFeature(.SendingArgsAndResults, to: .sendingArgsAndResults)
mapFeature(.TrailingComma, to: .trailingComma)
}
}

Expand Down
Loading