Drop 'Token' and 'Keyword' suffixes from static methods on 'TokenSyntax'

This allows us to unify Tokens.swift in SwiftSyntax and SwiftSyntaxBuilder.

Author: ahoppen

Sources/SwiftSyntax/SyntaxFactory.swift.gyb

@@ -1,5 +1,6 @@
 %{
   from gyb_syntax_support import *
+  from gyb_syntax_support.kinds import lowercase_first_word
   # -*- mode: Swift -*-
   # Ignore the following admonition it applies to the resulting .swift file only
 }%
@@ -124,7 +125,7 @@ public enum SyntaxFactory {
 %   leading_trivia = token_trivia(token.requires_leading_space)
 %   trailing_trivia = token_trivia(token.requires_trailing_space)
 %   if token.is_keyword:
-  @available(*, deprecated, message: "Use TokenSyntax.${token.swift_kind()}Keyword instead")
+  @available(*, deprecated, message: "Use TokenSyntax.${lowercase_first_word(token.name)} instead")
   public static func make${token.name}Keyword(
     leadingTrivia: Trivia = ${leading_trivia},
     trailingTrivia: Trivia = ${trailing_trivia}
@@ -134,7 +135,7 @@ public enum SyntaxFactory {
                      trailingTrivia: trailingTrivia)
   }
 %   elif token.text:
-  @available(*, deprecated, message: "Use TokenSyntax.${token.swift_kind()}Token instead")
+  @available(*, deprecated, message: "Use TokenSyntax.${token.swift_kind()} instead")
   public static func make${token.name}Token(
     leadingTrivia: Trivia = ${leading_trivia},
     trailingTrivia: Trivia = ${trailing_trivia}

Sources/SwiftSyntax/Tokens.swift.gyb

@@ -1,5 +1,6 @@
 %{
   from gyb_syntax_support import *
+  from gyb_syntax_support.kinds import lowercase_first_word
   # -*- mode: Swift -*-
   # Ignore the following admonition it applies to the resulting .swift file only
 }%
@@ -31,7 +32,7 @@ extension TokenSyntax {
 %   leading_trivia = '.space' if token.requires_leading_space else '[]'
 %   trailing_trivia = '.space' if token.requires_trailing_space else '[]'
 %   if token.is_keyword:
-  public static func ${token.swift_kind()}(
+  public static func `${lowercase_first_word(token.name)}`(
     leadingTrivia: Trivia? = nil,
     trailingTrivia: Trivia? = nil,
     presence: SourcePresence = .present
@@ -44,7 +45,7 @@ extension TokenSyntax {
     )
   }
 %   elif token.text:
-  public static func ${token.swift_kind()}Token(
+  public static func ${token.swift_kind()}(
     leadingTrivia: Trivia? = nil,
     trailingTrivia: Trivia? = nil,
     presence: SourcePresence = .present
@@ -78,9 +79,23 @@ extension TokenSyntax {
   ) -> TokenSyntax {
     return TokenSyntax(
       .eof,
-      leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: ${leading_trivia}),
+      leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
       trailingTrivia: [],
       presence: presence
     )
   }
+
+  /// The `open` contextual token
+  public static func open(
+    leadingTrivia: Trivia? = nil,
+    trailingTrivia: Trivia? = nil,
+    presence: SourcePresence = .present
+  ) -> TokenSyntax {
+    return TokenSyntax(
+      .contextualKeyword("open"),
+      leadingTrivia: leadingTrivia ?? defaultTrivia(presence: presence, trivia: []),
+      trailingTrivia: trailingTrivia ?? defaultTrivia(presence: presence, trivia: .space),
+      presence: presence
+    )
+  }
 }