Factor out utility method for format-leadingTrivia params

Author: fwcd

Sources/SwiftSyntaxBuilderGeneration/SyntaxUtilities.swift

@@ -61,3 +61,24 @@ func createTypeInheritanceClause(conformances: [String]) -> TypeInheritanceClaus
     }
   }
 }
+
+/// Create a parameter clause of the form `format: .comma, leadingTrivia: Trivia = nil`
+/// where the presence of ` = nil` is controlled by `withDefaultTrivia`.
+func createFormatLeadingTriviaParameters(withDefaultTrivia: Bool = false) -> ParameterClause {
+  ParameterClause(
+    parameterList: [
+      FunctionParameter(
+        firstName: .identifier("format"),
+        colon: .colon,
+        type: "Format",
+        trailingComma: .comma
+      ),
+      FunctionParameter(
+        firstName: .identifier("leadingTrivia"),
+        colon: .colon,
+        type: OptionalType(wrappedType: "Trivia"),
+        defaultArgument: withDefaultTrivia ? InitializerClause(value: "nil") : nil
+      ),
+    ]
+  )
+}

Sources/SwiftSyntaxBuilderGeneration/Templates/BuildableBaseProtocolsFile.swift

@@ -46,7 +46,7 @@ let buildableBaseProtocolsFile = SourceFile {
         ].map { .docLineComment($0) + .newline }.reduce([], +),
         identifier: .identifier("build\(type.baseName)List"),
         signature: FunctionSignature(
-          input: formatLeadingTriviaParameters(),
+          input: createFormatLeadingTriviaParameters(),
           output: ArrayType(elementType: type.syntax)
         ),
         body: nil
@@ -66,7 +66,7 @@ let buildableBaseProtocolsFile = SourceFile {
         ].map { .docLineComment($0) + .newline }.reduce([], +),
         identifier: .identifier("build\(type.baseName)"),
         signature: FunctionSignature(
-          input: formatLeadingTriviaParameters(),
+          input: createFormatLeadingTriviaParameters(),
           output: type.syntax
         ),
         body: nil
@@ -98,7 +98,7 @@ let buildableBaseProtocolsFile = SourceFile {
         ].map { .docLineComment($0) + .newline }.reduce([], +),
         identifier: .identifier("build\(type.baseName)List"),
         signature: FunctionSignature(
-          input: formatLeadingTriviaParameters(withDefaultTrivia: true),
+          input: createFormatLeadingTriviaParameters(withDefaultTrivia: true),
           output: ArrayType(elementType: type.syntax)
         )
       ) {
@@ -122,7 +122,7 @@ let buildableBaseProtocolsFile = SourceFile {
         ].map { .docLineComment($0) + .newline }.reduce([], +),
           identifier: .identifier("buildSyntax"),
           signature: FunctionSignature(
-            input: formatLeadingTriviaParameters(withDefaultTrivia: true),
+            input: createFormatLeadingTriviaParameters(withDefaultTrivia: true),
             output: "Syntax"
           )
         ) {
@@ -137,24 +137,3 @@ let buildableBaseProtocolsFile = SourceFile {
     }
   }
 }
-
-// Generate a (format: Format, leadingTrivia: Trivia?) parameter clause
-// to avoid duplication among the protocols above.
-private func formatLeadingTriviaParameters(withDefaultTrivia: Bool = false) -> ParameterClause {
-  ParameterClause(
-    parameterList: [
-      FunctionParameter(
-        firstName: .identifier("format"),
-        colon: .colon,
-        type: "Format",
-        trailingComma: .comma
-      ),
-      FunctionParameter(
-        firstName: .identifier("leadingTrivia"),
-        colon: .colon,
-        type: OptionalType(wrappedType: "Trivia"),
-        defaultArgument: withDefaultTrivia ? InitializerClause(value: "nil") : nil
-      ),
-    ]
-  )
-}

Sources/SwiftSyntaxBuilderGeneration/Templates/BuildableCollectionNodesFile.swift

@@ -119,22 +119,7 @@ let buildableCollectionNodesFile = SourceFile {
         modifiers: [TokenSyntax.public],
         identifier: .identifier("build\(type.baseName)"),
         signature: FunctionSignature(
-          input: ParameterClause(
-            parameterList: [
-              FunctionParameter(
-                firstName: .identifier("format"),
-                colon: .colon,
-                type: "Format",
-                trailingComma: .comma
-              ),
-              FunctionParameter(
-                firstName: .identifier("leadingTrivia"),
-                colon: .colon,
-                type: OptionalType(wrappedType: "Trivia"),
-                defaultArgument: InitializerClause(value: "nil")
-              ),
-            ]
-          ),
+          input: createFormatLeadingTriviaParameters(withDefaultTrivia: true),
           output: type.syntax
         )
       ) {
@@ -202,22 +187,7 @@ let buildableCollectionNodesFile = SourceFile {
         modifiers: [TokenSyntax.public],
         identifier: .identifier("buildSyntax"),
         signature: FunctionSignature(
-          input: ParameterClause(
-            parameterList: [
-              FunctionParameter(
-                firstName: .identifier("format"),
-                colon: .colon,
-                type: "Format",
-                trailingComma: .comma
-              ),
-              FunctionParameter(
-                firstName: .identifier("leadingTrivia"),
-                colon: .colon,
-                type: OptionalType(wrappedType: "Trivia"),
-                defaultArgument: InitializerClause(value: "nil")
-              ),
-            ]
-          ),
+          input: createFormatLeadingTriviaParameters(withDefaultTrivia: true),
           output: "Syntax"
         )
       ) {