Skip to content

Commit e1159bd

Browse files
committed
Add convenience initializers for MemberDeclList
1 parent b20fd94 commit e1159bd

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

Sources/SwiftSyntaxBuilder/gyb_generated/Buildables.swift

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5141,7 +5141,7 @@ public struct MemberDeclList: SyntaxBuildable {
51415141
}
51425142
}
51435143

5144-
public protocol ExpressibleAsMemberDeclList {
5144+
public protocol ExpressibleAsMemberDeclList: ExpressibleAsMemberDeclBlock {
51455145
func createMemberDeclList() -> MemberDeclList
51465146
}
51475147

@@ -12576,27 +12576,27 @@ extension TokenSyntax: ExpressibleAsTokenSyntax {
1257612576
}
1257712577
}
1257812578

12579-
extension ExpressibleAsDeclBuildable {
12579+
extension ExpressibleAsStmtBuildable {
1258012580
public func createCodeBlockItem() -> CodeBlockItem {
1258112581
CodeBlockItem(item: self)
1258212582
}
1258312583
}
1258412584

12585-
extension ExpressibleAsDeclBuildable {
12586-
public func createMemberDeclListItem() -> MemberDeclListItem {
12587-
MemberDeclListItem(decl: self)
12585+
extension ExpressibleAsMemberDeclList {
12586+
public func createMemberDeclBlock() -> MemberDeclBlock {
12587+
MemberDeclBlock(members: self)
1258812588
}
1258912589
}
1259012590

12591-
extension ExpressibleAsStmtBuildable {
12591+
extension ExpressibleAsDeclBuildable {
1259212592
public func createCodeBlockItem() -> CodeBlockItem {
1259312593
CodeBlockItem(item: self)
1259412594
}
1259512595
}
1259612596

12597-
extension ExpressibleAsExprList {
12598-
public func createConditionElement() -> ConditionElement {
12599-
ConditionElement(condition: self)
12597+
extension ExpressibleAsDeclBuildable {
12598+
public func createMemberDeclListItem() -> MemberDeclListItem {
12599+
MemberDeclListItem(decl: self)
1260012600
}
1260112601
}
1260212602

@@ -12612,3 +12612,9 @@ extension ExpressibleAsSimpleTypeIdentifier {
1261212612
}
1261312613
}
1261412614

12615+
extension ExpressibleAsExprList {
12616+
public func createConditionElement() -> ConditionElement {
12617+
ConditionElement(condition: self)
12618+
}
12619+
}
12620+

Tests/SwiftSyntaxBuilderTest/StructTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import SwiftSyntaxBuilder
55
final class StructTests: XCTestCase {
66
func testEmptyStruct() {
77
let leadingTrivia = Trivia.garbageText("")
8-
let members = MemberDeclBlock(members: MemberDeclList([]))
8+
let members = MemberDeclList([])
99
let buildable = StructDecl(identifier: "TestStruct",
1010
members: members)
1111
let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
@@ -21,11 +21,11 @@ final class StructTests: XCTestCase {
2121

2222
func testNestedStruct() {
2323
let leadingTrivia = Trivia.garbageText("")
24-
let emptyMembers = MemberDeclBlock(members: MemberDeclList([]))
24+
let emptyMembers = MemberDeclList([])
2525
let nestedStruct = StructDecl(structKeyword: TokenSyntax.struct.withLeadingTrivia(.docLineComment("/// A nested struct\n")),
2626
identifier: "NestedStruct",
2727
members: emptyMembers)
28-
let members = MemberDeclBlock(members: MemberDeclList([MemberDeclListItem(decl: nestedStruct)]))
28+
let members = MemberDeclListItem(decl: nestedStruct)
2929
let testStruct = StructDecl(identifier: "TestStruct",
3030
members: members)
3131
let syntax = testStruct.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
@@ -47,12 +47,12 @@ final class StructTests: XCTestCase {
4747
let myStruct = StructDecl(identifier: "MyStruct", members: MemberDeclBlock(membersBuilder: {
4848
for i in 0..<5 {
4949
if i.isMultiple(of: 2) {
50-
MemberDeclListItem(decl: VariableDecl(letOrVarKeyword: TokenSyntax.let, bindingsBuilder: {
50+
VariableDecl(letOrVarKeyword: TokenSyntax.let, bindingsBuilder: {
5151
PatternBinding(
5252
pattern: IdentifierPattern("var\(i)"),
5353
typeAnnotation: "String"
5454
)
55-
}))
55+
})
5656
}
5757
}
5858
}))

0 commit comments

Comments
 (0)