Fix string interpolation parsing errors in CodeGeneration

Author: ahoppen

CodeGeneration/Sources/Utils/SyntaxBuildableChild.swift

@@ -57,22 +57,19 @@ public extension Child {
     return self.type.optionalWrapped(type: SimpleTypeIdentifierSyntax(name: .identifier(parameterBaseType)))
   }
 
-  /// If the child node has a default value, return an expression of the form
-  /// ` = default_value` that can be used as the default value to for a
-  /// function parameter. Otherwise, return `nil`.
-  var defaultInitialization: InitializerClauseSyntax? {
+  var defaultValue: ExprSyntax? {
     if isOptional || isUnexpectedNodes {
       if type.isBaseType && kind.isNodeChoicesEmpty {
-        return InitializerClauseSyntax(value: ExprSyntax("\(type.buildable).none"))
+        return ExprSyntax("\(type.buildable).none")
       } else {
-        return InitializerClauseSyntax(value: NilLiteralExprSyntax())
+        return ExprSyntax("nil")
       }
     }
     guard let token = token, isToken else {
-      return type.defaultValue.map { InitializerClauseSyntax(value: $0) }
+      return type.defaultValue
     }
     if token.text != nil {
-      return InitializerClauseSyntax(value: ExprSyntax(".\(raw: token.swiftKind)Token()"))
+      return ExprSyntax(".\(raw: token.swiftKind)Token()")
     }
     guard case .token(let choices, _, _) = kind, choices.count == 1, token.associatedValueClass != nil else {
       return nil
@@ -85,7 +82,18 @@ public extension Child {
     if textChoice == "init" {
       textChoice = "`init`"
     }
-    return InitializerClauseSyntax(value: ExprSyntax(".\(raw: token.swiftKind)(.\(raw: textChoice))"))
+    return ExprSyntax(".\(raw: token.swiftKind)(.\(raw: textChoice))")
+  }
+
+  /// If the child node has a default value, return an expression of the form
+  /// ` = default_value` that can be used as the default value to for a
+  /// function parameter. Otherwise, return `nil`.
+  var defaultInitialization: InitializerClauseSyntax? {
+    if let defaultValue {
+      return InitializerClauseSyntax(equal: .equalToken(leadingTrivia: .space, trailingTrivia: .space), value: defaultValue)
+    } else {
+      return nil
+    }
   }
 
   /// If this node is a token that can't contain arbitrary text, generate a Swift

CodeGeneration/Sources/generate-swiftsyntax/LayoutNode+Extensions.swift

@@ -198,5 +198,5 @@ fileprivate func convertFromSyntaxProtocolToSyntaxType(child: Child, useDeprecat
   if child.type.isBaseType && !child.kind.isNodeChoices {
     return ExprSyntax("\(raw: child.type.syntaxBaseName)(fromProtocol: \(raw: childName))")
   }
-  return ExprSyntax("\(raw: childName)")
+  return ExprSyntax("\(raw: childName.backtickedIfNeeded)")
 }

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift

@@ -52,7 +52,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
     try! StructDeclSyntax(
       """
       @_spi(RawSyntax)
-      public struct \(node.kind.rawType): \(node.kind.isBase ? node.kind.rawProtocolType : node.base.rawProtocolType))
+      public struct \(node.kind.rawType): \(node.kind.isBase ? node.kind.rawProtocolType : node.base.rawProtocolType)
       """
     ) {
       for (name, choices) in node.childrenChoicesEnums {