Improvements for do and related statements
#511
Conversation
| @@ -22,7 +22,7 @@ final class StructTests: XCTestCase { | |||
| let nestedStruct = StructDecl( | |||
| structKeyword: .struct.withLeadingTrivia(.docLineComment("/// A nested struct\n")), | |||
| identifier: "NestedStruct", | |||
| genericParameterClause: GenericParameterClause { | |||
| genericParameterClause: GenericParameterClause(rightAngleBracket: .rightAngle.withoutTrailingTrivia()) { | |||
There was a problem hiding this comment.
This is a temporary fix needed because of updates for the where keyword. I'm going to remove it with adjusting spaces around angle brackets in my next PR
There was a problem hiding this comment.
I’m not sure how big the changes for the angle brackets are but feel free to include them in this PR.
There was a problem hiding this comment.
Not big, however I'd like to make a separate PR for them
| CatchClause(CatchItems { | ||
| CatchItem(pattern: "Error1") | ||
| CatchItem(pattern: "Error2") | ||
| }) { |
There was a problem hiding this comment.
I’m not entirely convinced this is much better than the default implementation that’s already provided.
| CatchClause(CatchItems { | |
| CatchItem(pattern: "Error1") | |
| CatchItem(pattern: "Error2") | |
| }) { | |
| CatchClause(catchItems: CatchItemList([ | |
| CatchItem(pattern: "Error1"), | |
| CatchItem(pattern: "Error2") | |
| ])) { |
Do you have some example where the result builder syntax is superior than using an array here?
There was a problem hiding this comment.
- Result builder automatically inserts trailing commas
- This
CatchClauseconvenience initializer adds trailing space to thecatchkeyword
There was a problem hiding this comment.
- I really don’t like the idea of introducing yet another type for catch items. We now have
CatchItemsListSyntax,CatchItemsListandCatchItems. What do you think about adding an initializer like the following toCatchItemList. We could add the same for all syntax collections:
public init(@CatchItemListBuilder itemsBuilder: () -> ExpressibleAsCatchItemList) {
self = itemsBuilder().createCatchItemList()
}- Can’t we just mark the
catchkeyword asrequires_trailing_spacein https://github.com/apple/swift/blob/5dfa894ea773c1cb82106d831cd4d2df4a837b75/utils/gyb_syntax_support/Token.py#L188?
There was a problem hiding this comment.
- Great idea, I've raised Element List initializers accepting result builder #519 for it
- I actually did the opposite to avoid double space when there is no catch items, so I'd like to keep this convenience initializer
| @@ -22,7 +22,7 @@ final class StructTests: XCTestCase { | |||
| let nestedStruct = StructDecl( | |||
| structKeyword: .struct.withLeadingTrivia(.docLineComment("/// A nested struct\n")), | |||
| identifier: "NestedStruct", | |||
| genericParameterClause: GenericParameterClause { | |||
| genericParameterClause: GenericParameterClause(rightAngleBracket: .rightAngle.withoutTrailingTrivia()) { | |||
There was a problem hiding this comment.
I’m not sure how big the changes for the angle brackets are but feel free to include them in this PR.
|
@ahoppen any comments for the updated implementation? |
|
@swift-ci Please test |
|
@swift-ci Please test |
1 similar comment
|
@swift-ci Please test |
* Leading/trailing spaces are updated to make statements well formatted * `CatchClause` convenience initializer that calculates spacing around the `catch` keyword * Test coverage for above changes
|
@swift-ci Please test |
CatchClauseconvenience initializer that calculates spacing around thecatchkeywordswiftlang/swift#60204