Skip to content

No longer require trailing space after expression-like keywords #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2022
Merged

No longer require trailing space after expression-like keywords #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7371,7 +7371,7 @@ public enum SyntaxFactory {
@available(*, deprecated, message: "Use TokenSyntax.falseKeywordKeyword instead")
public static func makeFalseKeyword(
leadingTrivia: Trivia = [],
trailingTrivia: Trivia = .space
trailingTrivia: Trivia = []
) -> TokenSyntax {
return makeToken(.falseKeyword, presence: .present,
leadingTrivia: leadingTrivia,
Expand All @@ -7389,7 +7389,7 @@ public enum SyntaxFactory {
@available(*, deprecated, message: "Use TokenSyntax.nilKeywordKeyword instead")
public static func makeNilKeyword(
leadingTrivia: Trivia = [],
trailingTrivia: Trivia = .space
trailingTrivia: Trivia = []
) -> TokenSyntax {
return makeToken(.nilKeyword, presence: .present,
leadingTrivia: leadingTrivia,
Expand All @@ -7407,7 +7407,7 @@ public enum SyntaxFactory {
@available(*, deprecated, message: "Use TokenSyntax.superKeywordKeyword instead")
public static func makeSuperKeyword(
leadingTrivia: Trivia = [],
trailingTrivia: Trivia = .space
trailingTrivia: Trivia = []
) -> TokenSyntax {
return makeToken(.superKeyword, presence: .present,
leadingTrivia: leadingTrivia,
Expand All @@ -7416,7 +7416,7 @@ public enum SyntaxFactory {
@available(*, deprecated, message: "Use TokenSyntax.selfKeywordKeyword instead")
public static func makeSelfKeyword(
leadingTrivia: Trivia = [],
trailingTrivia: Trivia = .space
trailingTrivia: Trivia = []
) -> TokenSyntax {
return makeToken(.selfKeyword, presence: .present,
leadingTrivia: leadingTrivia,
Expand All @@ -7425,7 +7425,7 @@ public enum SyntaxFactory {
@available(*, deprecated, message: "Use TokenSyntax.capitalSelfKeywordKeyword instead")
public static func makeCapitalSelfKeyword(
leadingTrivia: Trivia = [],
trailingTrivia: Trivia = .space
trailingTrivia: Trivia = []
) -> TokenSyntax {
return makeToken(.capitalSelfKeyword, presence: .present,
leadingTrivia: leadingTrivia,
Expand All @@ -7434,7 +7434,7 @@ public enum SyntaxFactory {
@available(*, deprecated, message: "Use TokenSyntax.trueKeywordKeyword instead")
public static func makeTrueKeyword(
leadingTrivia: Trivia = [],
trailingTrivia: Trivia = .space
trailingTrivia: Trivia = []
) -> TokenSyntax {
return makeToken(.trueKeyword, presence: .present,
leadingTrivia: leadingTrivia,
Expand Down
12 changes: 6 additions & 6 deletions Sources/SwiftSyntax/gyb_generated/Tokens.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ extension TokenSyntax {
return TokenSyntax(
.falseKeyword,
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
presence: presence
)
}
Expand All @@ -570,7 +570,7 @@ extension TokenSyntax {
return TokenSyntax(
.nilKeyword,
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
presence: presence
)
}
Expand All @@ -594,7 +594,7 @@ extension TokenSyntax {
return TokenSyntax(
.superKeyword,
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
presence: presence
)
}
Expand All @@ -606,7 +606,7 @@ extension TokenSyntax {
return TokenSyntax(
.selfKeyword,
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
presence: presence
)
}
Expand All @@ -618,7 +618,7 @@ extension TokenSyntax {
return TokenSyntax(
.capitalSelfKeyword,
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
presence: presence
)
}
Expand All @@ -630,7 +630,7 @@ extension TokenSyntax {
return TokenSyntax(
.trueKeyword,
leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: []),
presence: presence
)
}
Expand Down
22 changes: 11 additions & 11 deletions Sources/SwiftSyntaxBuilder/generated/BuildableBaseProtocols.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public extension DeclBuildable {
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
///
/// Satisfies conformance to `DeclListBuildable`
func buildDeclList(format: Format, leadingTrivia: Trivia? = nil ) -> [DeclSyntax] {
func buildDeclList(format: Format, leadingTrivia: Trivia? = nil) -> [DeclSyntax] {
return [buildDecl(format: format, leadingTrivia: leadingTrivia)]
}
/// Builds a `DeclSyntax`.
Expand All @@ -45,7 +45,7 @@ public extension DeclBuildable {
/// - Returns: A new `Syntax` with the built `DeclSyntax`.
///
/// Satisfies conformance to `SyntaxBuildable`.
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
return Syntax(buildDecl(format: format, leadingTrivia: leadingTrivia))
}
}
Expand All @@ -71,7 +71,7 @@ public extension ExprBuildable {
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
///
/// Satisfies conformance to `ExprListBuildable`
func buildExprList(format: Format, leadingTrivia: Trivia? = nil ) -> [ExprSyntax] {
func buildExprList(format: Format, leadingTrivia: Trivia? = nil) -> [ExprSyntax] {
return [buildExpr(format: format, leadingTrivia: leadingTrivia)]
}
/// Builds a `ExprSyntax`.
Expand All @@ -80,7 +80,7 @@ public extension ExprBuildable {
/// - Returns: A new `Syntax` with the built `ExprSyntax`.
///
/// Satisfies conformance to `SyntaxBuildable`.
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
return Syntax(buildExpr(format: format, leadingTrivia: leadingTrivia))
}
}
Expand All @@ -106,7 +106,7 @@ public extension PatternBuildable {
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
///
/// Satisfies conformance to `PatternListBuildable`
func buildPatternList(format: Format, leadingTrivia: Trivia? = nil ) -> [PatternSyntax] {
func buildPatternList(format: Format, leadingTrivia: Trivia? = nil) -> [PatternSyntax] {
return [buildPattern(format: format, leadingTrivia: leadingTrivia)]
}
/// Builds a `PatternSyntax`.
Expand All @@ -115,7 +115,7 @@ public extension PatternBuildable {
/// - Returns: A new `Syntax` with the built `PatternSyntax`.
///
/// Satisfies conformance to `SyntaxBuildable`.
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
return Syntax(buildPattern(format: format, leadingTrivia: leadingTrivia))
}
}
Expand All @@ -141,7 +141,7 @@ public extension StmtBuildable {
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
///
/// Satisfies conformance to `StmtListBuildable`
func buildStmtList(format: Format, leadingTrivia: Trivia? = nil ) -> [StmtSyntax] {
func buildStmtList(format: Format, leadingTrivia: Trivia? = nil) -> [StmtSyntax] {
return [buildStmt(format: format, leadingTrivia: leadingTrivia)]
}
/// Builds a `StmtSyntax`.
Expand All @@ -150,7 +150,7 @@ public extension StmtBuildable {
/// - Returns: A new `Syntax` with the built `StmtSyntax`.
///
/// Satisfies conformance to `SyntaxBuildable`.
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
return Syntax(buildStmt(format: format, leadingTrivia: leadingTrivia))
}
}
Expand All @@ -176,7 +176,7 @@ public extension SyntaxBuildable {
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
///
/// Satisfies conformance to `SyntaxListBuildable`
func buildSyntaxList(format: Format, leadingTrivia: Trivia? = nil ) -> [Syntax] {
func buildSyntaxList(format: Format, leadingTrivia: Trivia? = nil) -> [Syntax] {
return [buildSyntax(format: format, leadingTrivia: leadingTrivia)]
}
}
Expand All @@ -202,7 +202,7 @@ public extension TypeBuildable {
/// - Parameter leadingTrivia: Replaces the last leading trivia if not nil.
///
/// Satisfies conformance to `TypeListBuildable`
func buildTypeList(format: Format, leadingTrivia: Trivia? = nil ) -> [TypeSyntax] {
func buildTypeList(format: Format, leadingTrivia: Trivia? = nil) -> [TypeSyntax] {
return [buildType(format: format, leadingTrivia: leadingTrivia)]
}
/// Builds a `TypeSyntax`.
Expand All @@ -211,7 +211,7 @@ public extension TypeBuildable {
/// - Returns: A new `Syntax` with the built `TypeSyntax`.
///
/// Satisfies conformance to `SyntaxBuildable`.
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil ) -> Syntax {
func buildSyntax(format: Format, leadingTrivia: Trivia? = nil) -> Syntax {
return Syntax(buildType(format: format, leadingTrivia: leadingTrivia))
}
}
Loading