Add utility property for adding backticks

Author: fwcd

Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,

Sources/SwiftSyntax/gyb_generated/Tokens.swift

@@ -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
     )
   }
@@ -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
     )
   }
@@ -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
     )
   }
@@ -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
     )
   }
@@ -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
     )
   }
@@ -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
     )
   }

Sources/SwiftSyntaxBuilderGeneration/String+Extensions.swift

@@ -14,4 +14,5 @@ import Foundation
 
 extension StringProtocol {
     var withFirstCharacterLowercased: String { prefix(1).lowercased() + dropFirst() }
+    var backticked: String { "`\(self)`" }
 }

Sources/SwiftSyntaxBuilderGeneration/Templates/TokensFile.swift

@@ -35,10 +35,10 @@ let tokensFile = SourceFile {
           // We need to use `CodeBlock` here to ensure there is braces around.
 
           let accessor = CodeBlock {
-            FunctionCallExpr(MemberAccessExpr(base: "TokenSyntax", name: "\(token.swiftKind)"))
+            FunctionCallExpr(MemberAccessExpr(base: "TokenSyntax", name: token.swiftKind))
           }
 
-          createTokenSyntaxPatternBinding("`\(token.name.withFirstCharacterLowercased)`", accessor: accessor)
+          createTokenSyntaxPatternBinding(token.name.withFirstCharacterLowercased.backticked, accessor: accessor)
         }
       } else if let text = token.text {
         VariableDecl(
@@ -51,7 +51,30 @@ let tokensFile = SourceFile {
             FunctionCallExpr(MemberAccessExpr(base: "TokenSyntax", name: "\(token.swiftKind)Token"))
           }
 
-          createTokenSyntaxPatternBinding("`\(token.name.withFirstCharacterLowercased)`", accessor: accessor)
+          createTokenSyntaxPatternBinding(token.name.withFirstCharacterLowercased.backticked, accessor: accessor)
+        }
+      } else {
+        let signature = FunctionSignature(
+          input: ParameterClause {
+            FunctionParameter(
+              attributes: nil,
+              firstName: .wildcard,
+              secondName: .identifier("text"),
+              colon: .colon,
+              type: "String"
+            )
+          },
+          output: "TokenSyntax"
+        )
+
+        FunctionDecl(
+          modifiers: [TokenSyntax.static],
+          identifier: .identifier(token.name.withFirstCharacterLowercased.backticked),
+          signature: signature
+        ) {
+          FunctionCallExpr(MemberAccessExpr(base: "SyntaxFactory", name: "make\(token.name)")) {
+            TupleExprElement(expression: IdentifierExpr("text"))
+          }
         }
       }
       // TokenSyntax with custom text already has a static constructor function defined in SwiftSyntax.