Skip to content

Commit 23c6e1a

Browse files
fwcdfwcd
committed
No longer require trailing space after expression-like keywords
1 parent 5bc624d commit 23c6e1a

File tree

6 files changed

+119
-119
lines changed

6 files changed

+119
-119
lines changed

‎Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7371,7 +7371,7 @@ public enum SyntaxFactory {
73717371
@available(*, deprecated, message: "Use TokenSyntax.falseKeywordKeyword instead")
73727372
public static func makeFalseKeyword(
73737373
leadingTrivia: Trivia = [],
7374-
trailingTrivia: Trivia = .space
7374+
trailingTrivia: Trivia = []
73757375
) -> TokenSyntax {
73767376
return makeToken(.falseKeyword, presence: .present,
73777377
leadingTrivia: leadingTrivia,
@@ -7389,7 +7389,7 @@ public enum SyntaxFactory {
73897389
@available(*, deprecated, message: "Use TokenSyntax.nilKeywordKeyword instead")
73907390
public static func makeNilKeyword(
73917391
leadingTrivia: Trivia = [],
7392-
trailingTrivia: Trivia = .space
7392+
trailingTrivia: Trivia = []
73937393
) -> TokenSyntax {
73947394
return makeToken(.nilKeyword, presence: .present,
73957395
leadingTrivia: leadingTrivia,
@@ -7407,7 +7407,7 @@ public enum SyntaxFactory {
74077407
@available(*, deprecated, message: "Use TokenSyntax.superKeywordKeyword instead")
74087408
public static func makeSuperKeyword(
74097409
leadingTrivia: Trivia = [],
7410-
trailingTrivia: Trivia = .space
7410+
trailingTrivia: Trivia = []
74117411
) -> TokenSyntax {
74127412
return makeToken(.superKeyword, presence: .present,
74137413
leadingTrivia: leadingTrivia,
@@ -7416,7 +7416,7 @@ public enum SyntaxFactory {
74167416
@available(*, deprecated, message: "Use TokenSyntax.selfKeywordKeyword instead")
74177417
public static func makeSelfKeyword(
74187418
leadingTrivia: Trivia = [],
7419-
trailingTrivia: Trivia = .space
7419+
trailingTrivia: Trivia = []
74207420
) -> TokenSyntax {
74217421
return makeToken(.selfKeyword, presence: .present,
74227422
leadingTrivia: leadingTrivia,
@@ -7425,7 +7425,7 @@ public enum SyntaxFactory {
74257425
@available(*, deprecated, message: "Use TokenSyntax.capitalSelfKeywordKeyword instead")
74267426
public static func makeCapitalSelfKeyword(
74277427
leadingTrivia: Trivia = [],
7428-
trailingTrivia: Trivia = .space
7428+
trailingTrivia: Trivia = []
74297429
) -> TokenSyntax {
74307430
return makeToken(.capitalSelfKeyword, presence: .present,
74317431
leadingTrivia: leadingTrivia,
@@ -7434,7 +7434,7 @@ public enum SyntaxFactory {
74347434
@available(*, deprecated, message: "Use TokenSyntax.trueKeywordKeyword instead")
74357435
public static func makeTrueKeyword(
74367436
leadingTrivia: Trivia = [],
7437-
trailingTrivia: Trivia = .space
7437+
trailingTrivia: Trivia = []
74387438
) -> TokenSyntax {
74397439
return makeToken(.trueKeyword, presence: .present,
74407440
leadingTrivia: leadingTrivia,

‎Sources/SwiftSyntax/gyb_generated/Tokens.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ extension TokenSyntax {
546546
return TokenSyntax(
547547
.falseKeyword,
548548
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
549-
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
549+
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
550550
presence: presence
551551
)
552552
}
@@ -570,7 +570,7 @@ extension TokenSyntax {
570570
return TokenSyntax(
571571
.nilKeyword,
572572
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
573-
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
573+
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
574574
presence: presence
575575
)
576576
}
@@ -594,7 +594,7 @@ extension TokenSyntax {
594594
return TokenSyntax(
595595
.superKeyword,
596596
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
597-
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
597+
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
598598
presence: presence
599599
)
600600
}
@@ -606,7 +606,7 @@ extension TokenSyntax {
606606
return TokenSyntax(
607607
.selfKeyword,
608608
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
609-
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
609+
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
610610
presence: presence
611611
)
612612
}
@@ -618,7 +618,7 @@ extension TokenSyntax {
618618
return TokenSyntax(
619619
.capitalSelfKeyword,
620620
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
621-
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
621+
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
622622
presence: presence
623623
)
624624
}
@@ -630,7 +630,7 @@ extension TokenSyntax {
630630
return TokenSyntax(
631631
.trueKeyword,
632632
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
633-
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
633+
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
634634
presence: presence
635635
)
636636
}

‎Sources/SwiftSyntaxBuilder/generated/BuildableBaseProtocols.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public extension 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 @@ public extension DeclBuildable {
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 @@ public extension 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 @@ public extension ExprBuildable {
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 @@ public extension 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 @@ public extension PatternBuildable {
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 @@ public extension 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 @@ public extension StmtBuildable {
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 @@ public extension 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 @@ public extension 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 @@ public extension TypeBuildable {
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
}

0 commit comments

Comments
 (0)