WIP

Author: ahoppen

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

@@ -427,16 +427,4 @@ let syntaxCollectionsFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
       )
     }
   }
-
-  for node in SYNTAX_NODES where node.isSyntaxCollection {
-    DeclSyntax(
-      """
-      extension \(raw: node.name): CustomReflectable {
-        public var customMirror: Mirror {
-          return Mirror(self, unlabeledChildren: self.map{ $0 })
-        }
-      }
-      """
-    )
-  }
 }

Sources/SwiftSyntax/Syntax.swift

@@ -604,14 +604,10 @@ public extension SyntaxProtocol {
     return Mirror(self, children: [:])
   }
 
-  /// Same as `debugDescription` but includes all children.
-  var recursiveDescription: String {
-    debugDescription(includeChildren: true)
-  }
-
   /// Returns a summarized dump of this node.
   /// - Parameters:
-  ///   - includeChildren: Whether to also dump children, false by default.
+  ///   - includeChildNames: Add the name of each child before the child itself.
+  ///     `false` by default.
   ///   - includeTrivia: Add trivia to each dumped node, which the default
   ///   dump skips.
   ///   - converter: The location converter for the root of the tree. Adds
@@ -621,7 +617,7 @@ public extension SyntaxProtocol {
   ///   - indentLevel: The starting indent level, 0 by default. Each level is 2
   ///   spaces.
   func debugDescription(
-    includeChildren: Bool = true,
+    includeChildNames: Bool = false,
     includeTrivia: Bool = false,
     converter: SourceLocationConverter? = nil,
     mark: SyntaxProtocol? = nil,
@@ -630,7 +626,6 @@ public extension SyntaxProtocol {
     var str = ""
     debugWrite(
       to: &str,
-      includeChildren: includeChildren,
       includeTrivia: includeTrivia,
       converter: converter,
       mark: mark,
@@ -641,7 +636,6 @@ public extension SyntaxProtocol {
 
   private func debugWrite<Target: TextOutputStream>(
     to target: inout Target,
-    includeChildren: Bool,
     includeTrivia: Bool,
     converter: SourceLocationConverter? = nil,
     mark: SyntaxProtocol? = nil,
@@ -680,22 +674,22 @@ public extension SyntaxProtocol {
       target.write(" ***")
     }
 
-    if includeChildren {
-      for (num, child) in allChildren.enumerated() {
-        let isLastChild = num == allChildren.count - 1
-        target.write("\n")
-        target.write(indentString)
-        target.write(isLastChild ? "╰─" : "├─")
-        let childIndentString = indentString + (isLastChild ? "  " : "│ ")
-        child.debugWrite(
-          to: &target,
-          includeChildren: includeChildren,
-          includeTrivia: includeTrivia,
-          converter: converter,
-          mark: mark,
-          indentString: childIndentString
-        )
+    for (num, child) in allChildren.enumerated() {
+      let isLastChild = num == allChildren.count - 1
+      target.write("\n")
+      target.write(indentString)
+      target.write(isLastChild ? "╰─" : "├─")
+      let childIndentString = indentString + (isLastChild ? "  " : "│ ")
+      if case .layout(let layout) = type(of: child).structure {
+        target.write("\(layout[num]): ")
       }
+      child.debugWrite(
+        to: &target,
+        includeTrivia: includeTrivia,
+        converter: converter,
+        mark: mark,
+        indentString: childIndentString
+      )
     }
   }
 }
@@ -804,14 +798,14 @@ extension ReversedTokenSequence: CustomReflectable {
   }
 }
 
-/// Expose `recursiveDescription` on raw nodes for debugging purposes.
-extension RawSyntaxNodeProtocol {
-  /// Print this raw syntax node including all of its children.
-  /// Intended for debugging purposes only.
-  var recursiveDescription: String {
-    return Syntax(raw: raw).recursiveDescription
-  }
-}
+///// Expose `recursiveDescription` on raw nodes for debugging purposes.
+//extension RawSyntaxNodeProtocol {
+//  /// Print this raw syntax node including all of its children.
+//  /// Intended for debugging purposes only.
+//  var recursiveDescription: String {
+//    return Syntax(raw: raw).recursiveDescription
+//  }
+//}
 
 @available(*, unavailable, message: "use 'Syntax' instead")
 public struct SyntaxNode {}