Skip to content

Commit e8f596c

Browse files
authored
Merge pull request swiftlang#645 from fwcd/fwcd/format-leading-trivia
Factor out all `leadingTrivia` logic into `Format`
2 parents a7e3a15 + 1d832c7 commit e8f596c

33 files changed

+3815
-2609
lines changed

Sources/SwiftSyntaxBuilder/generated/BuildableBaseProtocols.swift

+34-57
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@ import SwiftSyntax
1717
public protocol DeclListBuildable: SyntaxListBuildable {
1818
/// Builds list of `DeclSyntax`s.
1919
/// - Parameter format: The `Format` to use.
20-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
21-
func buildDeclList(format: Format, leadingTrivia: Trivia?) -> [DeclSyntax]
20+
func buildDeclList(format: Format) -> [DeclSyntax]
2221
}
2322
public protocol DeclBuildable: ExpressibleAsDeclBuildable, DeclListBuildable, SyntaxBuildable {
2423
/// Builds list of `DeclSyntax`s.
2524
/// - Parameter format: The `Format` to use.
26-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
27-
func buildDecl(format: Format, leadingTrivia: Trivia?) -> DeclSyntax
25+
func buildDecl(format: Format) -> DeclSyntax
2826
}
2927
public extension DeclBuildable {
3028
/// Satisfies conformance to `ExpressibleAsDeclBuildable`.
@@ -33,33 +31,29 @@ public extension DeclBuildable {
3331
}
3432
/// Builds list of `DeclSyntax`s.
3533
/// - Parameter format: The `Format` to use.
36-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
3734
///
3835
/// Satisfies conformance to `DeclListBuildable`
39-
func buildDeclList(format: Format, leadingTrivia: Trivia? = nil) -> [DeclSyntax] {
40-
return [buildDecl(format: format, leadingTrivia: leadingTrivia)]
36+
func buildDeclList(format: Format) -> [DeclSyntax] {
37+
return [buildDecl(format: format)]
4138
}
4239
/// Builds a `DeclSyntax`.
4340
/// - Parameter format: The `Format` to use.
44-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
4541
/// - Returns: A new `Syntax` with the built `DeclSyntax`.
4642
///
4743
/// Satisfies conformance to `SyntaxBuildable`.
48-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
49-
return Syntax(buildDecl(format: format, leadingTrivia: leadingTrivia))
44+
func buildSyntax(format: Format) -> Syntax {
45+
return Syntax(buildDecl(format: format))
5046
}
5147
}
5248
public protocol ExprListBuildable: SyntaxListBuildable {
5349
/// Builds list of `ExprSyntax`s.
5450
/// - Parameter format: The `Format` to use.
55-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
56-
func buildExprList(format: Format, leadingTrivia: Trivia?) -> [ExprSyntax]
51+
func buildExprList(format: Format) -> [ExprSyntax]
5752
}
5853
public protocol ExprBuildable: ExpressibleAsExprBuildable, ExprListBuildable, SyntaxBuildable {
5954
/// Builds list of `ExprSyntax`s.
6055
/// - Parameter format: The `Format` to use.
61-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
62-
func buildExpr(format: Format, leadingTrivia: Trivia?) -> ExprSyntax
56+
func buildExpr(format: Format) -> ExprSyntax
6357
}
6458
public extension ExprBuildable {
6559
/// Satisfies conformance to `ExpressibleAsExprBuildable`.
@@ -68,33 +62,29 @@ public extension ExprBuildable {
6862
}
6963
/// Builds list of `ExprSyntax`s.
7064
/// - Parameter format: The `Format` to use.
71-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
7265
///
7366
/// Satisfies conformance to `ExprListBuildable`
74-
func buildExprList(format: Format, leadingTrivia: Trivia? = nil) -> [ExprSyntax] {
75-
return [buildExpr(format: format, leadingTrivia: leadingTrivia)]
67+
func buildExprList(format: Format) -> [ExprSyntax] {
68+
return [buildExpr(format: format)]
7669
}
7770
/// Builds a `ExprSyntax`.
7871
/// - Parameter format: The `Format` to use.
79-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
8072
/// - Returns: A new `Syntax` with the built `ExprSyntax`.
8173
///
8274
/// Satisfies conformance to `SyntaxBuildable`.
83-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
84-
return Syntax(buildExpr(format: format, leadingTrivia: leadingTrivia))
75+
func buildSyntax(format: Format) -> Syntax {
76+
return Syntax(buildExpr(format: format))
8577
}
8678
}
8779
public protocol PatternListBuildable: SyntaxListBuildable {
8880
/// Builds list of `PatternSyntax`s.
8981
/// - Parameter format: The `Format` to use.
90-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
91-
func buildPatternList(format: Format, leadingTrivia: Trivia?) -> [PatternSyntax]
82+
func buildPatternList(format: Format) -> [PatternSyntax]
9283
}
9384
public protocol PatternBuildable: ExpressibleAsPatternBuildable, PatternListBuildable, SyntaxBuildable {
9485
/// Builds list of `PatternSyntax`s.
9586
/// - Parameter format: The `Format` to use.
96-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
97-
func buildPattern(format: Format, leadingTrivia: Trivia?) -> PatternSyntax
87+
func buildPattern(format: Format) -> PatternSyntax
9888
}
9989
public extension PatternBuildable {
10090
/// Satisfies conformance to `ExpressibleAsPatternBuildable`.
@@ -103,33 +93,29 @@ public extension PatternBuildable {
10393
}
10494
/// Builds list of `PatternSyntax`s.
10595
/// - Parameter format: The `Format` to use.
106-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
10796
///
10897
/// Satisfies conformance to `PatternListBuildable`
109-
func buildPatternList(format: Format, leadingTrivia: Trivia? = nil) -> [PatternSyntax] {
110-
return [buildPattern(format: format, leadingTrivia: leadingTrivia)]
98+
func buildPatternList(format: Format) -> [PatternSyntax] {
99+
return [buildPattern(format: format)]
111100
}
112101
/// Builds a `PatternSyntax`.
113102
/// - Parameter format: The `Format` to use.
114-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
115103
/// - Returns: A new `Syntax` with the built `PatternSyntax`.
116104
///
117105
/// Satisfies conformance to `SyntaxBuildable`.
118-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
119-
return Syntax(buildPattern(format: format, leadingTrivia: leadingTrivia))
106+
func buildSyntax(format: Format) -> Syntax {
107+
return Syntax(buildPattern(format: format))
120108
}
121109
}
122110
public protocol StmtListBuildable: SyntaxListBuildable {
123111
/// Builds list of `StmtSyntax`s.
124112
/// - Parameter format: The `Format` to use.
125-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
126-
func buildStmtList(format: Format, leadingTrivia: Trivia?) -> [StmtSyntax]
113+
func buildStmtList(format: Format) -> [StmtSyntax]
127114
}
128115
public protocol StmtBuildable: ExpressibleAsStmtBuildable, StmtListBuildable, SyntaxBuildable {
129116
/// Builds list of `StmtSyntax`s.
130117
/// - Parameter format: The `Format` to use.
131-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
132-
func buildStmt(format: Format, leadingTrivia: Trivia?) -> StmtSyntax
118+
func buildStmt(format: Format) -> StmtSyntax
133119
}
134120
public extension StmtBuildable {
135121
/// Satisfies conformance to `ExpressibleAsStmtBuildable`.
@@ -138,33 +124,29 @@ public extension StmtBuildable {
138124
}
139125
/// Builds list of `StmtSyntax`s.
140126
/// - Parameter format: The `Format` to use.
141-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
142127
///
143128
/// Satisfies conformance to `StmtListBuildable`
144-
func buildStmtList(format: Format, leadingTrivia: Trivia? = nil) -> [StmtSyntax] {
145-
return [buildStmt(format: format, leadingTrivia: leadingTrivia)]
129+
func buildStmtList(format: Format) -> [StmtSyntax] {
130+
return [buildStmt(format: format)]
146131
}
147132
/// Builds a `StmtSyntax`.
148133
/// - Parameter format: The `Format` to use.
149-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
150134
/// - Returns: A new `Syntax` with the built `StmtSyntax`.
151135
///
152136
/// Satisfies conformance to `SyntaxBuildable`.
153-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
154-
return Syntax(buildStmt(format: format, leadingTrivia: leadingTrivia))
137+
func buildSyntax(format: Format) -> Syntax {
138+
return Syntax(buildStmt(format: format))
155139
}
156140
}
157141
public protocol SyntaxListBuildable {
158142
/// Builds list of `Syntax`s.
159143
/// - Parameter format: The `Format` to use.
160-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
161-
func buildSyntaxList(format: Format, leadingTrivia: Trivia?) -> [Syntax]
144+
func buildSyntaxList(format: Format) -> [Syntax]
162145
}
163146
public protocol SyntaxBuildable: ExpressibleAsSyntaxBuildable, SyntaxListBuildable {
164147
/// Builds list of `Syntax`s.
165148
/// - Parameter format: The `Format` to use.
166-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
167-
func buildSyntax(format: Format, leadingTrivia: Trivia?) -> Syntax
149+
func buildSyntax(format: Format) -> Syntax
168150
}
169151
public extension SyntaxBuildable {
170152
/// Satisfies conformance to `ExpressibleAsSyntaxBuildable`.
@@ -173,24 +155,21 @@ public extension SyntaxBuildable {
173155
}
174156
/// Builds list of `Syntax`s.
175157
/// - Parameter format: The `Format` to use.
176-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
177158
///
178159
/// Satisfies conformance to `SyntaxListBuildable`
179-
func buildSyntaxList(format: Format, leadingTrivia: Trivia? = nil) -> [Syntax] {
180-
return [buildSyntax(format: format, leadingTrivia: leadingTrivia)]
160+
func buildSyntaxList(format: Format) -> [Syntax] {
161+
return [buildSyntax(format: format)]
181162
}
182163
}
183164
public protocol TypeListBuildable: SyntaxListBuildable {
184165
/// Builds list of `TypeSyntax`s.
185166
/// - Parameter format: The `Format` to use.
186-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
187-
func buildTypeList(format: Format, leadingTrivia: Trivia?) -> [TypeSyntax]
167+
func buildTypeList(format: Format) -> [TypeSyntax]
188168
}
189169
public protocol TypeBuildable: ExpressibleAsTypeBuildable, TypeListBuildable, SyntaxBuildable {
190170
/// Builds list of `TypeSyntax`s.
191171
/// - Parameter format: The `Format` to use.
192-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
193-
func buildType(format: Format, leadingTrivia: Trivia?) -> TypeSyntax
172+
func buildType(format: Format) -> TypeSyntax
194173
}
195174
public extension TypeBuildable {
196175
/// Satisfies conformance to `ExpressibleAsTypeBuildable`.
@@ -199,19 +178,17 @@ public extension TypeBuildable {
199178
}
200179
/// Builds list of `TypeSyntax`s.
201180
/// - Parameter format: The `Format` to use.
202-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
203181
///
204182
/// Satisfies conformance to `TypeListBuildable`
205-
func buildTypeList(format: Format, leadingTrivia: Trivia? = nil) -> [TypeSyntax] {
206-
return [buildType(format: format, leadingTrivia: leadingTrivia)]
183+
func buildTypeList(format: Format) -> [TypeSyntax] {
184+
return [buildType(format: format)]
207185
}
208186
/// Builds a `TypeSyntax`.
209187
/// - Parameter format: The `Format` to use.
210-
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
211188
/// - Returns: A new `Syntax` with the built `TypeSyntax`.
212189
///
213190
/// Satisfies conformance to `SyntaxBuildable`.
214-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
215-
return Syntax(buildType(format: format, leadingTrivia: leadingTrivia))
191+
func buildSyntax(format: Format) -> Syntax {
192+
return Syntax(buildType(format: format))
216193
}
217194
}

0 commit comments

Comments
 (0)