8000 Merge pull request #647 from ahoppen/ahoppen/token-buildable · swiftlang/swift-syntax@c0f3642 · GitHub
[go: up one dir, main page]
Skip to content

Commit c0f3642

Browse files
ahoppenahoppen
authored
Merge pull request #647 from ahoppen/ahoppen/token-buildable
Use a dedicated `Token` type in SwiftSyntaxBuilder
2 parents bb62ba2 + 261f857 commit c0f3642

File tree

55 files changed

+2230
-2058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2230
-2058
lines changed

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ let package = Package(
146146
"PatternNodes.swift.gyb",
147147
"StmtNodes.swift.gyb",
148148
"SyntaxBaseKinds.swift.gyb",
149-
"Tokens.swift.gyb",
149+
"TokenSpec.swift.gyb",
150150
"Traits.swift.gyb",
151151
"Trivia.swift.gyb",
152152
"TypeNodes.swift.gyb"

‎Sources/SwiftSyntaxBuilder/BinaryOperatorExprConvenienceInitializers.swift renamed to ‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers/BinaryOperatorExprConvenienceInitializers.swift

File renamed without changes.

‎Sources/SwiftSyntaxBuilder/BooleanLiteralExprConvenienceInitializers.swift renamed to ‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers/BooleanLiteralExprConvenienceInitializers.swift

File renamed without changes.

‎Sources/SwiftSyntaxBuilder/CatchClauseConvenienceInitializer.swift renamed to ‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers/CatchClauseConvenienceInitializer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extension CatchClause {
2121
) {
2222
self.init(
2323
leadingTrivia: leadingTrivia,
24-
catchKeyword: .catchKeyword(trailingTrivia: catchItems.elements.isEmpty ? [] : .space),
24+
catchKeyword: .catch.withTrailingTrivia(catchItems.elements.isEmpty ? [] : .space),
2525
catchItems: catchItems,
2626
body: bodyBuilder()
2727
)

‎Sources/SwiftSyntaxBuilder/DictionaryExprConvenienceInitializers.swift renamed to ‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers/DictionaryExprConvenienceInitializers.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ extension DictionaryExpr {
1616
/// A convenience initializer that allows passing in members using a result builder
1717
/// instead of having to wrap them in a `DictionaryElementList`.
1818
public init(
19-
leftSquare: TokenSyntax = .`leftSquareBracket`,
20-
rightSquare: TokenSyntax = .`rightSquareBracket`,
19+
leftSquare: Token = .`leftSquareBracket`,
20+
rightSquare: Token = .`rightSquareBracket`,
2121
@DictionaryElementListBuilder contentBuilder: () -> ExpressibleAsDictionaryElementList = { [] }
2222
) {
2323
let elementList = contentBuilder().createDictionaryElementList()
2424
self.init(
2525
leftSquare: leftSquare,
26-
content: elementList.elements.isEmpty ? TokenSyntax.colonToken(trailingTrivia: []) : elementList,
26+
content: elementList.elements.isEmpty ? Token.colon.withTrailingTrivia([]) : elementList,
2727
rightSquare: rightSquare
2828
)
2929
}

‎Sources/SwiftSyntaxBuilder/FloatLiteralExprConvenienceInitializers.swift renamed to ‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers/FloatLiteralExprConvenienceInitializers.swift

File renamed without changes.

‎Sources/SwiftSyntaxBuilder/FunctionCallExprConvenienceInitializers.swift renamed to ‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers/FunctionCallExprConvenienceInitializers.swift

File renamed without changes.

‎Sources/SwiftSyntaxBuilder/IdentifierExprConvenienceInitializers.swift renamed to ‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers/IdentifierExprConvenienceInitializers.swift

File renamed without changes.

‎Sources/SwiftSyntaxBuilder/IdentifierPatternConvenienceInitializers.swift renamed to ‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers/IdentifierPatternConvenienceInitializers.swift

File renamed without changes.

‎Sources/SwiftSyntaxBuilder/IfStmtConvenienceInitializers.swift renamed to ‎Sources/SwiftSyntaxBuilder/ConvenienceInitializers/IfStmtConvenienceInitializers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public extension IfStmt {
2727
leadingTrivia: leadingTrivia,
2828
conditions: conditions,
2929
body: body(),
30-
elseKeyword: generatedElseBody == nil ? nil : TokenSyntax.elseKeyword(leadingTrivia: .space, trailingTrivia: []),
30+
elseKeyword: generatedElseBody == nil ? nil : Token.else.withLeadingTrivia(.space).withTrailingTrivia([]),
3131
elseBody: generatedElseBody.map { CodeBlock(statements: $0) }
3232
)
3333
}

0 commit comments

Comments
 (0)
0