Make TokenSyntax expressible by string literal and remove convenience initializers that take a string

rdar://104090088

Author: ahoppen

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift

@@ -109,22 +109,6 @@ private func createConvenienceInitializer(node: Node) -> InitializerDeclSyntax?
         "@\(builderInitializableType.resultBuilderBaseName) \(child.swiftName)Builder: () -> \(builderInitializableType.syntax) = \(defaultArgument)",
         for: .functionParameters
       ))
-    } else if let token = child.type.token, token.text == nil, (child.textChoices.count != 1 || token.associatedValueClass == nil) {
-      // Allow initializing identifiers and other tokens without default text with a String
-      shouldCreateInitializer = true
-      let paramType = child.type.optionalWrapped(type: "\(raw: token.associatedValueClass ?? "String")" as TypeSyntax)
-      let tokenExpr = MemberAccessExprSyntax("TokenSyntax.\(raw: token.swiftKind.withFirstCharacterLowercased.backticked)")
-      if child.type.isOptional {
-        produceExpr = ExprSyntax(FunctionCallExprSyntax("\(raw: child.swiftName).map { \(tokenExpr)($0) }"))
-      } else {
-        produceExpr = ExprSyntax(FunctionCallExprSyntax("\(tokenExpr)(\(raw: child.swiftName))"))
-      }
-      normalParameters.append(FunctionParameterSyntax(
-        firstName: .identifier(child.swiftName),
-        colon: .colonToken(),
-        type: paramType,
-        defaultArgument: child.defaultInitialization.map { InitializerClauseSyntax(value: $0) }
-      ))
     } else {
       produceExpr = convertFromSyntaxProtocolToSyntaxType(child: child)
       normalParameters.append(FunctionParameterSyntax(
@@ -142,11 +126,7 @@ private func createConvenienceInitializer(node: Node) -> InitializerDeclSyntax?
   }
 
   return InitializerDeclSyntax(
-    leadingTrivia: [
-      "/// A convenience initializer that allows:",
-      "///  - Initializing syntax collections using result builders",
-      "///  - Initializing tokens without default text using strings",
-    ].map { .docLineComment($0) + .newline }.reduce([], +),
+    leadingTrivia: .docLineComment("/// A convenience initializer that allows initializing syntax collections using result builders") + .newline,
     modifiers: [DeclModifierSyntax(name: .keyword(.public))],
     signature: FunctionSignatureSyntax(
       input: ParameterClauseSyntax {

Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift

@@ -25,7 +25,7 @@ extension BinaryOperatorExprSyntax {
 
 extension BooleanLiteralExprSyntax: ExpressibleByBooleanLiteral {
   public init(_ value: Bool) {
-    self.init(booleanLiteral: value ? .true : .false)
+    self.init(booleanLiteral: value ? .keyword(.true) : .keyword(.false))
   }
 
   public init(booleanLiteral value: Bool) {
@@ -130,7 +130,7 @@ extension ExprSyntax {
 
 extension FloatLiteralExprSyntax: ExpressibleByFloatLiteral {
   public init(_ value: Float) {
-    self.init(floatingDigits: String(value))
+    self.init(floatingDigits: .floatingLiteral(String(value)))
   }
 
   public init(floatLiteral value: Float) {
@@ -213,7 +213,7 @@ extension IfStmtSyntax {
 
 extension IntegerLiteralExprSyntax: ExpressibleByIntegerLiteral {
   public init(_ value: Int) {
-    self.init(digits: String(value))
+    self.init(digits: .integerLiteral(String(value)))
   }
 
   public init(integerLiteral value: Int) {
@@ -402,7 +402,7 @@ extension VariableDeclSyntax {
       leadingTrivia: leadingTrivia,
       attributes: attributes?.withTrailingTrivia(.space),
       modifiers: modifiers,
-      letOrVarKeyword: letOrVarKeyword
+      letOrVarKeyword: .keyword(letOrVarKeyword)
     ) {
       PatternBindingSyntax(
         pattern: name,
@@ -425,7 +425,7 @@ extension VariableDeclSyntax {
       leadingTrivia: leadingTrivia,
       attributes: attributes?.withTrailingTrivia(.space),
       modifiers: modifiers,
-      letOrVarKeyword: .var
+      letOrVarKeyword: .keyword(.var)
     ) {
       PatternBindingSyntax(
         pattern: name,

Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift

@@ -12,7 +12,7 @@
 
 import SwiftBasicFormat
 import SwiftDiagnostics
-import SwiftSyntax
+@_spi(RawSyntax) import SwiftSyntax
 
 /// An individual interpolated syntax node.
 struct InterpolatedSyntaxNode {
@@ -266,7 +266,7 @@ extension ExpressibleByLiteralSyntax where Self: BinaryInteger {
   public func makeLiteralSyntax() -> IntegerLiteralExprSyntax {
     // TODO: Radix selection? Thousands separators?
     let digits = String(self, radix: 10)
-    return IntegerLiteralExprSyntax(digits: digits)
+    return IntegerLiteralExprSyntax(digits: .integerLiteral(digits))
   }
 }
 extension Int: ExpressibleByLiteralSyntax {}
@@ -303,7 +303,7 @@ extension ExpressibleByLiteralSyntax where Self: FloatingPoint, Self: LosslessSt
     case .negativeNormal, .negativeSubnormal, .positiveZero, .positiveSubnormal, .positiveNormal:
       // TODO: Thousands separators?
       let digits = String(self)
-      return ExprSyntax(FloatLiteralExprSyntax(floatingDigits: digits))
+      return ExprSyntax(FloatLiteralExprSyntax(floatingDigits: .floatingLiteral(digits)))
     }
 
   }
@@ -438,3 +438,12 @@ extension Optional: ExpressibleByLiteralSyntax where Wrapped: ExpressibleByLiter
     }
   }
 }
+
+extension TokenSyntax: SyntaxExpressibleByStringInterpolation {
+  public init(stringInterpolationOrThrow stringInterpolation: SyntaxStringInterpolation) throws {
+    let string = stringInterpolation.sourceText.withUnsafeBufferPointer { buf in
+      return String(syntaxText: SyntaxText(buffer: buf))
+    }
+    self = .identifier(string)
+  }
+}