Merge pull request swiftlang#647 from ahoppen/ahoppen/token-buildable

Use a dedicated `Token` type in SwiftSyntaxBuilder

Author: ahoppen

Package.swift

@@ -146,7 +146,7 @@ let package = Package(
           "PatternNodes.swift.gyb",
           "StmtNodes.swift.gyb",
           "SyntaxBaseKinds.swift.gyb",
-          "Tokens.swift.gyb",
+          "TokenSpec.swift.gyb",
           "Traits.swift.gyb",
           "Trivia.swift.gyb",
           "TypeNodes.swift.gyb"

…peratorExprConvenienceInitializers.swift …peratorExprConvenienceInitializers.swiftSources/SwiftSyntaxBuilder/BinaryOperatorExprConvenienceInitializers.swift renamed to Sources/SwiftSyntaxBuilder/ConvenienceInitializers/BinaryOperatorExprConvenienceInitializers.swift Sources/SwiftSyntaxBuilder/BinaryOperatorExprConvenienceInitializers.swift renamed to Sources/SwiftSyntaxBuilder/ConvenienceInitializers/BinaryOperatorExprConvenienceInitializers.swift

@@ -21,7 +21,7 @@ extension CatchClause {
   ) {
     self.init(
       leadingTrivia: leadingTrivia,
-      catchKeyword: .catchKeyword(trailingTrivia: catchItems.elements.isEmpty ? [] : .space),
+      catchKeyword: .catch.withTrailingTrivia(catchItems.elements.isEmpty ? [] : .space),
       catchItems: catchItems,
       body: bodyBuilder()
     )

…LiteralExprConvenienceInitializers.swift …LiteralExprConvenienceInitializers.swiftSources/SwiftSyntaxBuilder/BooleanLiteralExprConvenienceInitializers.swift renamed to Sources/SwiftSyntaxBuilder/ConvenienceInitializers/BooleanLiteralExprConvenienceInitializers.swift Sources/SwiftSyntaxBuilder/BooleanLiteralExprConvenienceInitializers.swift renamed to Sources/SwiftSyntaxBuilder/ConvenienceInitializers/BooleanLiteralExprConvenienceInitializers.swift

@@ -16,14 +16,14 @@ extension DictionaryExpr {
   /// A convenience initializer that allows passing in members using a result builder
   /// instead of having to wrap them in a `DictionaryElementList`.
   public init(
-    leftSquare: TokenSyntax = .`leftSquareBracket`,
-    rightSquare: TokenSyntax = .`rightSquareBracket`,
+    leftSquare: Token = .`leftSquareBracket`,
+    rightSquare: Token = .`rightSquareBracket`,
     @DictionaryElementListBuilder contentBuilder: () -> ExpressibleAsDictionaryElementList = { [] }
   ) {
     let elementList = contentBuilder().createDictionaryElementList()
     self.init(
       leftSquare: leftSquare,
-      content: elementList.elements.isEmpty ? TokenSyntax.colonToken(trailingTrivia: []) : elementList,
+      content: elementList.elements.isEmpty ? Token.colon.withTrailingTrivia([]) : elementList,
       rightSquare: rightSquare
     )
   }

…/CatchClauseConvenienceInitializer.swift …/CatchClauseConvenienceInitializer.swiftSources/SwiftSyntaxBuilder/CatchClauseConvenienceInitializer.swift renamed to Sources/SwiftSyntaxBuilder/ConvenienceInitializers/CatchClauseConvenienceInitializer.swift Sources/SwiftSyntaxBuilder/CatchClauseConvenienceInitializer.swift renamed to Sources/SwiftSyntaxBuilder/ConvenienceInitializers/CatchClauseConvenienceInitializer.swift

@@ -27,7 +27,7 @@ public extension IfStmt {
       leadingTrivia: leadingTrivia,
       conditions: conditions,
       body: body(),
-      elseKeyword: generatedElseBody == nil ? nil : TokenSyntax.elseKeyword(leadingTrivia: .space, trailingTrivia: []),
+      elseKeyword: generatedElseBody == nil ? nil : Token.else.withLeadingTrivia(.space).withTrailingTrivia([]),
       elseBody: generatedElseBody.map { CodeBlock(statements: $0) }
     )
   }