Merge pull request #293 from kimdv/kimdv/move-tokens-to-token-syntax-extension

Move Token helpers to TokenSyntax extension

Author: ahoppen

Sources/SwiftSyntaxBuilder/BooleanLiteralExprConvenienceInitializers.swift

@@ -14,7 +14,7 @@ import SwiftSyntax
 
 extension BooleanLiteralExpr {
   public init(_ value: Bool) {
-    self.init(booleanLiteral: value ? Tokens.true : Tokens.false)
+    self.init(booleanLiteral: value ? .true : .false)
   }
 }
 

Sources/SwiftSyntaxBuilder/BuildablesConvenienceInitializers.swift.gyb

@@ -72,9 +72,9 @@ extension ${node.syntax_kind} {
 %         end
 %       elif token and not token.text:
 %         if child.is_optional:
-%           init_parameters.append("%s: %s.map(Tokens.%s)" % (child.swift_name, child.swift_name, lowercase_first_word(token.name)))
+%           init_parameters.append("%s: %s.map(TokenSyntax.%s)" % (child.swift_name, child.swift_name, lowercase_first_word(token.name)))
 %         else:
-%           init_parameters.append("%s: Tokens.%s(%s)" % (child.swift_name, lowercase_first_word(token.name), child.swift_name))
+%           init_parameters.append("%s: TokenSyntax.%s(%s)" % (child.swift_name, lowercase_first_word(token.name), child.swift_name))
 %         end
 %       else:
 %         init_parameters.append("%s: %s" % (child.swift_name, child.swift_name))

Sources/SwiftSyntaxBuilder/StringLiteralExprConvenienceInitializers.swift

@@ -18,9 +18,9 @@ extension StringLiteralExpr {
     let segment = StringSegment(content: content)
     let segments = StringLiteralSegments([segment])
 
-    self.init(openQuote: Tokens.stringQuote,
+    self.init(openQuote: .stringQuote,
               segments: segments,
-              closeQuote: Tokens.stringQuote)
+              closeQuote: .stringQuote)
   }
 }
 

Sources/SwiftSyntaxBuilder/Tokens.swift.gyb

@@ -21,11 +21,11 @@
 import SwiftSyntax
 
 /// Namespace for commonly used tokens with default trivia.
-public enum Tokens {
+public extension TokenSyntax {
 % for token in SYNTAX_TOKENS:
 %   if token.is_keyword:
   /// The `${token.text.encode('utf-8').decode('unicode_escape')}` keyword
-  public static let `${lowercase_first_word(token.name)}` = SyntaxFactory.make${token.name}Keyword()
+  static let `${lowercase_first_word(token.name)}` = SyntaxFactory.make${token.name}Keyword()
 %   if token.requires_leading_space:
     .withLeadingTrivia(.spaces(1))
 %   end
@@ -34,15 +34,15 @@ public enum Tokens {
 %   end
 %   elif token.text:
   /// The `${token.text.encode('utf-8').decode('unicode_escape')}` token
-  public static let `${lowercase_first_word(token.name)}` = SyntaxFactory.make${token.name}Token()
+  static let `${lowercase_first_word(token.name)}` = SyntaxFactory.make${token.name}Token()
 %   if token.requires_leading_space:
     .withLeadingTrivia(.spaces(1))
 %   end
 %   if token.requires_trailing_space:
     .withTrailingTrivia(.spaces(1))
 %   end
 %   else:
-  public static func `${lowercase_first_word(token.name)}`(_ text: String) -> TokenSyntax {
+  static func `${lowercase_first_word(token.name)}`(_ text: String) -> TokenSyntax {
     SyntaxFactory.make${token.name}(text)
 %   if token.requires_leading_space:
     .withLeadingTrivia(.spaces(1))