Move methods modifying a node's trivia to SyntaxProtocol

Author: ahoppen

Sources/SwiftSyntax/Syntax.swift

@@ -257,14 +257,24 @@ public extension SyntaxProtocol {
   /// the first token syntax contained by this node. Without such token, this
   /// property will return nil.
   var leadingTrivia: Trivia? {
-    return raw.formLeadingTrivia()
+    get {
+      return raw.formLeadingTrivia()
+    }
+    set {
+      self = withLeadingTrivia(newValue ?? [])
+    }
   }
 
   /// The trailing trivia of this syntax node. Trailing trivia is attached to
   /// the last token syntax contained by this node. Without such token, this
   /// property will return nil.
   var trailingTrivia: Trivia? {
-    return raw.formTrailingTrivia()
+    get {
+      return raw.formTrailingTrivia()
+    }
+    set {
+      self = withTrailingTrivia(newValue ?? [])
+    }
   }
 
   /// The length this node's leading trivia takes up spelled out in source.
@@ -277,6 +287,33 @@ public extension SyntaxProtocol {
     return raw.trailingTriviaLength
   }
 
+  /// Returns a new syntax node with its leading trivia replaced
+  /// by the provided trivia.
+  func withLeadingTrivia(_ leadingTrivia: Trivia) -> Self {
+    return Self(Syntax(data.withLeadingTrivia(leadingTrivia)))!
+  }
+
+  /// Returns a new syntax node with its trailing trivia replaced
+  /// by the provided trivia.
+  func withTrailingTrivia(_ trailingTrivia: Trivia) -> Self {
+    return Self(Syntax(data.withTrailingTrivia(trailingTrivia)))!
+  }
+
+  /// Returns a new `${node.name}` with its leading trivia removed.
+  func withoutLeadingTrivia() -> Self {
+    return withLeadingTrivia([])
+  }
+
+  /// Returns a new `${node.name}` with its trailing trivia removed.
+  func withoutTrailingTrivia() -> Self {
+    return withTrailingTrivia([])
+  }
+
+  /// Returns a new `${node.name}` with all trivia removed.
+  func withoutTrivia() -> Self {
+    return withoutLeadingTrivia().withoutTrailingTrivia()
+  }
+
   /// The length of this node including all of its trivia.
   var totalLength: SourceLength {
     return raw.totalLength

Sources/SwiftSyntax/SyntaxNodes.swift.gyb

@@ -45,6 +45,8 @@ Each node will have:
 %     # Handled in SyntaxCollections.swift.gyb
 %     pass
 %   else:
+%     # We are actually handling this node now
+// MARK: - ${node.name}
 
 %     for line in dedented_lines(node.description):
 /// ${line}
@@ -138,64 +140,8 @@ public struct ${node.name}: ${base_type}Protocol {
     return ${node.name}(newData)
   }
 %     end
-
-  /// Returns a new `${node.name}` with its leading trivia replaced
-  /// by the provided trivia.
-  public func withLeadingTrivia(_ leadingTrivia: Trivia) -> ${node.name} {
-    return ${node.name}(data.withLeadingTrivia(leadingTrivia))
-  }
-
-  /// Returns a new `${node.name}` with its trailing trivia replaced
-  /// by the provided trivia.
-  public func withTrailingTrivia(_ trailingTrivia: Trivia) -> ${node.name} {
-    return ${node.name}(data.withTrailingTrivia(trailingTrivia))
-  }
-
-  /// Returns a new `${node.name}` with its leading trivia removed.
-  public func withoutLeadingTrivia() -> ${node.name} {
-    return withLeadingTrivia([])
-  }
-
-  /// Returns a new `${node.name}` with its trailing trivia removed.
-  public func withoutTrailingTrivia() -> ${node.name} {
-    return withTrailingTrivia([])
-  }
-
-  /// Returns a new `${node.name}` with all trivia removed.
-  public func withoutTrivia() -> ${node.name} {
-    return withoutLeadingTrivia().withoutTrailingTrivia()
-  }
-
-  /// The leading trivia (spaces, newlines, etc.) associated with this `${node.name}`.
-  public var leadingTrivia: Trivia? {
-    get {
-      return raw.formLeadingTrivia()
-    }
-    set {
-      self = withLeadingTrivia(newValue ?? [])
-    }
-  }
-
-  /// The trailing trivia (spaces, newlines, etc.) associated with this `${node.name}`.
-  public var trailingTrivia: Trivia? {
-    get {
-      return raw.formTrailingTrivia()
-    }
-    set {
-      self = withTrailingTrivia(newValue ?? [])
-    }
-  }
 }
-%   end
-% end
 
-% for node in SYNTAX_NODES:
-%   if node.is_base():
-%     # Handled in SyntaxNodesBase.swift.gyb
-%     pass
-%   elif node.is_syntax_collection():
-%     pass
-%   else:
 extension ${node.name}: CustomReflectable {
   public var customMirror: Mirror {
     return Mirror(self, children: [
@@ -209,5 +155,6 @@ extension ${node.name}: CustomReflectable {
     ])
   }
 }
+
 %   end
 % end