rename

Author: rintaro

CodeGeneration/Sources/generate-swift-syntax/GenerateSwiftSyntax.swift

@@ -115,7 +115,6 @@ struct GenerateSwiftSyntax: AsyncParsableCommand {
       ),
 
       // SwiftSyntax
-      GeneratedFileSpec(swiftSyntaxGeneratedDir + ["ChildNameForKeyPath.swift"], childNameForKeyPathFile),
       GeneratedFileSpec(swiftSyntaxGeneratedDir + ["ConcreteSyntaxProperty.swift"], concreteSyntaxPropertyFile),
       GeneratedFileSpec(swiftSyntaxGeneratedDir + ["Keyword.swift"], keywordFile),
       GeneratedFileSpec(swiftSyntaxGeneratedDir + ["raw", "RawSyntaxValidation.swift"], rawSyntaxValidationFile),
@@ -129,6 +128,7 @@ struct GenerateSwiftSyntax: AsyncParsableCommand {
       GeneratedFileSpec(swiftSyntaxGeneratedDir + ["SyntaxCollections.swift"], syntaxCollectionsFile),
       GeneratedFileSpec(swiftSyntaxGeneratedDir + ["SyntaxEnum.swift"], syntaxEnumFile),
       GeneratedFileSpec(swiftSyntaxGeneratedDir + ["SyntaxKind.swift"], syntaxKindFile),
+      GeneratedFileSpec(swiftSyntaxGeneratedDir + ["SyntaxLayoutNodes.swift"], syntaxLayoutNodesFile),
       GeneratedFileSpec(swiftSyntaxGeneratedDir + ["SyntaxRewriter.swift"], syntaxRewriterFile),
       GeneratedFileSpec(swiftSyntaxGeneratedDir + ["SyntaxTraits.swift"], syntaxTraitsFile),
       GeneratedFileSpec(

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/ConcreteSyntaxPropertyFile.swift

@@ -16,15 +16,6 @@ import SyntaxSupport
 import Utils
 
 let concreteSyntaxPropertyFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
-  DeclSyntax("""
-  extension SyntaxLayout {
-    fileprivate init(kind: SyntaxKind, count: UInt32) {
-      self.baseKind = kind
-      self._count = count
-    }
-  }
-  """)
-
   DeclSyntax("""
   extension ConcreteSyntaxProperty {
     fileprivate init(index: UInt32) {
@@ -35,15 +26,6 @@ let concreteSyntaxPropertyFile = SourceFileSyntax(leadingTrivia: copyrightHeader
 
   for node in NON_BASE_SYNTAX_NODES {
     if let layoutNode = node.layoutNode {
-      try! ExtensionDeclSyntax(
-        "extension \(node.kind.syntaxType): _LayoutSyntaxProtocol"
-      ) {
-        DeclSyntax("""
-        public static var layout: SyntaxLayout<Self> {
-          SyntaxLayout<Self>(kind: .\(node.enumCaseCallName), count: \(literal: layoutNode.children.count))
-        }
-        """)
-      }
       try! ExtensionDeclSyntax(
         "\(node.apiAttributes())extension ConcreteSyntaxProperty where Base == \(node.kind.syntaxType)"
       ) {

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/ChildNameForKeyPathFile.swift renamed to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxLayoutNodesFile.swift

@@ -15,7 +15,30 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let childNameForKeyPathFile = try! SourceFileSyntax(leadingTrivia: copyrightHeader) {
+let syntaxLayoutNodesFile = try! SourceFileSyntax(leadingTrivia: copyrightHeader) {
+  DeclSyntax("""
+  extension SyntaxLayout {
+    fileprivate init(kind: SyntaxKind, count: UInt32) {
+      self.baseKind = kind
+      self._count = count
+    }
+  }
+  """)
+  
+  for node in NON_BASE_SYNTAX_NODES {
+    if let layoutNode = node.layoutNode {
+      try! ExtensionDeclSyntax(
+        "extension \(node.kind.syntaxType): _LayoutSyntaxProtocol"
+      ) {
+        DeclSyntax("""
+        public static var layout: SyntaxLayout<Self> {
+          SyntaxLayout<Self>(kind: .\(node.enumCaseCallName), count: \(literal: layoutNode.children.count))
+        }
+        """)
+      }
+    }
+  }
+
   try ExtensionDeclSyntax("extension SyntaxLayoutProperty") {
     try VariableDeclSyntax(
       """

Sources/SwiftSyntax/SyntaxLayout.swift

@@ -50,6 +50,7 @@ public struct SyntaxLayout<Base: _LayoutSyntaxProtocol> {
   private init() { fatalError() }
 }
 
+#if false // Not needed at this point.
 extension SyntaxLayout: Collection {
   public typealias Index = SyntaxLayoutIndex
   public typealias Element = SyntaxLayoutProperty
@@ -63,6 +64,7 @@ extension SyntaxLayout: Collection {
     return SyntaxLayoutProperty(baseKind: baseKind, index: position)
   }
 }
+#endif
 
 public protocol _LayoutSyntaxProtocol: SyntaxProtocol {
   static var layout: SyntaxLayout<Self> { get }
@@ -106,7 +108,12 @@ extension SyntaxProtocol {
 
   /// Returns a new syntax node that has the child at `property` replaced by
   /// `value`.
-  func with<T: SyntaxProtocol>(_ property: ConcreteSyntaxProperty<Self, T>, _ value: T) -> Self {
+  public func with<T: SyntaxProtocol>(_ property: ConcreteSyntaxProperty<Self, T>, _ value: T) -> Self {
+    Syntax(self)
+      .replacingChild(at: Int(property.index.value), with: Syntax(value), arena: SyntaxArena())
+      .cast(Self.self)
+  }
+  public func with<T: SyntaxProtocol>(_ property: ConcreteSyntaxProperty<Self, T?>, _ value: T?) -> Self {
     Syntax(self)
       .replacingChild(at: Int(property.index.value), with: Syntax(value), arena: SyntaxArena())
       .cast(Self.self)