Skip to content

Commit ec34a35

Browse files
committed
Use NilLiteralExpr where appropriate
Previously 'nil' was (incorrectly) generated as an identifier.
1 parent 5b89d7d commit ec34a35

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

Sources/SwiftSyntaxBuilder/generated/BuildableBaseProtocols.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func createDeclBuildable() -> DeclBuildable {
3636
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
3737
///
3838
/// Satisfies conformance to `DeclListBuildable`
39-
func buildDeclList(format: Format, leadingTrivia: Trivia? = nil) -> [DeclSyntax] {
39+
func buildDeclList(format: Format, leadingTrivia: Trivia? = nil ) -> [DeclSyntax] {
4040
return [buildDecl(format: format, leadingTrivia: leadingTrivia)]
4141
}
4242
/// Builds a `DeclSyntax`.
@@ -45,7 +45,7 @@ func buildDeclList(format: Format, leadingTrivia: Trivia? = nil) -> [DeclSyntax]
4545
/// - Returns: A new `Syntax` with the built `DeclSyntax`.
4646
///
4747
/// Satisfies conformance to `SyntaxBuildable`.
48-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
48+
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
4949
return Syntax(buildDecl(format: format, leadingTrivia: leadingTrivia))
5050
}
5151
}
@@ -71,7 +71,7 @@ func createExprBuildable() -> ExprBuildable {
7171
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
7272
///
7373
/// Satisfies conformance to `ExprListBuildable`
74-
func buildExprList(format: Format, leadingTrivia: Trivia? = nil) -> [ExprSyntax] {
74+
func buildExprList(format: Format, leadingTrivia: Trivia? = nil ) -> [ExprSyntax] {
7575
return [buildExpr(format: format, leadingTrivia: leadingTrivia)]
7676
}
7777
/// Builds a `ExprSyntax`.
@@ -80,7 +80,7 @@ func buildExprList(format: Format, leadingTrivia: Trivia? = nil) -> [ExprSyntax]
8080
/// - Returns: A new `Syntax` with the built `ExprSyntax`.
8181
///
8282
/// Satisfies conformance to `SyntaxBuildable`.
83-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
83+
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
8484
return Syntax(buildExpr(format: format, leadingTrivia: leadingTrivia))
8585
}
8686
}
@@ -106,7 +106,7 @@ func createPatternBuildable() -> PatternBuildable {
106106
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
107107
///
108108
/// Satisfies conformance to `PatternListBuildable`
109-
func buildPatternList(format: Format, leadingTrivia: Trivia? = nil) -> [PatternSyntax] {
109+
func buildPatternList(format: Format, leadingTrivia: Trivia? = nil ) -> [PatternSyntax] {
110110
return [buildPattern(format: format, leadingTrivia: leadingTrivia)]
111111
}
112112
/// Builds a `PatternSyntax`.
@@ -115,7 +115,7 @@ func buildPatternList(format: Format, leadingTrivia: Trivia? = nil) -> [PatternS
115115
/// - Returns: A new `Syntax` with the built `PatternSyntax`.
116116
///
117117
/// Satisfies conformance to `SyntaxBuildable`.
118-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
118+
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
119119
return Syntax(buildPattern(format: format, leadingTrivia: leadingTrivia))
120120
}
121121
}
@@ -141,7 +141,7 @@ func createStmtBuildable() -> StmtBuildable {
141141
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
142142
///
143143
/// Satisfies conformance to `StmtListBuildable`
144-
func buildStmtList(format: Format, leadingTrivia: Trivia? = nil) -> [StmtSyntax] {
144+
func buildStmtList(format: Format, leadingTrivia: Trivia? = nil ) -> [StmtSyntax] {
145145
return [buildStmt(format: format, leadingTrivia: leadingTrivia)]
146146
}
147147
/// Builds a `StmtSyntax`.
@@ -150,7 +150,7 @@ func buildStmtList(format: Format, leadingTrivia: Trivia? = nil) -> [StmtSyntax]
150150
/// - Returns: A new `Syntax` with the built `StmtSyntax`.
151151
///
152152
/// Satisfies conformance to `SyntaxBuildable`.
153-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
153+
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
154154
return Syntax(buildStmt(format: format, leadingTrivia: leadingTrivia))
155155
}
156156
}
@@ -176,7 +176,7 @@ func createSyntaxBuildable() -> SyntaxBuildable {
176176
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
177177
///
178178
/// Satisfies conformance to `SyntaxListBuildable`
179-
func buildSyntaxList(format: Format, leadingTrivia: Trivia? = nil) -> [Syntax] {
179+
func buildSyntaxList(format: Format, leadingTrivia: Trivia? = nil ) -> [Syntax] {
180180
return [buildSyntax(format: format, leadingTrivia: leadingTrivia)]
181181
}
182182
}
@@ -202,7 +202,7 @@ func createTypeBuildable() -> TypeBuildable {
202202
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
203203
///
204204
/// Satisfies conformance to `TypeListBuildable`
205-
func buildTypeList(format: Format, leadingTrivia: Trivia? = nil) -> [TypeSyntax] {
205+
func buildTypeList(format: Format, leadingTrivia: Trivia? = nil ) -> [TypeSyntax] {
206206
return [buildType(format: format, leadingTrivia: leadingTrivia)]
207207
}
208208
/// Builds a `TypeSyntax`.
@@ -211,7 +211,7 @@ func buildTypeList(format: Format, leadingTrivia: Trivia? = nil) -> [TypeSyntax]
211211
/// - Returns: A new `Syntax` with the built `TypeSyntax`.
212212
///
213213
/// Satisfies conformance to `SyntaxBuildable`.
214-
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
214+
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
215215
return Syntax(buildType(format: format, leadingTrivia: leadingTrivia))
216216
}
217217
}

Sources/SwiftSyntaxBuilderGeneration/SyntaxBuildableChild.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ extension Child {
6363
let expr = type.optionalChained(expr: varName)
6464
return FunctionCallExpr(MemberAccessExpr(base: expr, name: "build\(type.baseName)")) {
6565
TupleExprElement(label: "format", expression: format)
66-
TupleExprElement(label: "leadingTrivia", expression: "nil")
66+
TupleExprElement(label: "leadingTrivia", expression: NilLiteralExpr())
6767
}
6868
}
6969
}

Sources/SwiftSyntaxBuilderGeneration/SyntaxBuildableType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct SyntaxBuildableType: Hashable {
4343
/// Otherwise, return the empty string.
4444
var defaultInitialization: ExpressibleAsExprBuildable? {
4545
if isOptional {
46-
return "nil"
46+
return NilLiteralExpr()
4747
} else if isToken {
4848
if let token = token, token.text != nil {
4949
return MemberAccessExpr(base: "TokenSyntax", name: lowercaseFirstWord(name: token.name))

Sources/SwiftSyntaxBuilderGeneration/Templates/BuildableBaseProtocolsFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private func formatLeadingTriviaParameters(withDefaultTrivia: Bool = false) -> P
153153
firstName: .identifier("leadingTrivia"),
154154
colon: .colon,
155155
type: OptionalType(wrappedType: "Trivia"),
156-
defaultArgument: withDefaultTrivia ? InitializerClause(value: "nil") : nil
156+
defaultArgument: withDefaultTrivia ? InitializerClause(value: NilLiteralExpr()) : nil
157157
),
158158
]
159159
)

0 commit comments

Comments
 (0)