Fix CodeGenerationFormat to correctly indent certain children that span multiple lines

Author: roopekv

CodeGeneration/Sources/Utils/CodeGenerationFormat.swift

@@ -112,8 +112,8 @@ public class CodeGenerationFormat: BasicFormat {
         return false
       }
       let startsOnNewline =
-        node.leadingTrivia.contains { $0.isNewline }
-        || node.previousToken(viewMode: .sourceAccurate)?.trailingTrivia.contains { $0.isNewline } ?? false
+        node.leadingTrivia.contains(where: \.isNewline)
+        || node.previousToken(viewMode: .sourceAccurate)?.trailingTrivia.contains(where: \.isNewline) ?? false
       if !startsOnNewline {
         return false
       }
@@ -143,16 +143,21 @@ public class CodeGenerationFormat: BasicFormat {
     children: SyntaxChildren,
     elementType: SyntaxType.Type
   ) -> [SyntaxType] {
-    var formattedChildren = children.map { child in
-      var child = child.cast(SyntaxType.self)
-      child.leadingTrivia = Trivia(pieces: child.leadingTrivia.drop(while: \.isWhitespace))
-      return self.rewrite(child).cast(SyntaxType.self)
-    }
     increaseIndentationLevel()
+    var formattedChildren = children.map {
+      return self.rewrite($0.cast(SyntaxType.self)).cast(SyntaxType.self)
+    }
     formattedChildren = formattedChildren.map { child in
       var child = child
       child.trailingTrivia = Trivia(pieces: child.trailingTrivia.drop(while: \.isSpaceOrTab))
-      child.leadingTrivia = indentedNewline + child.leadingTrivia
+
+      let startsOnNewline =
+        child.leadingTrivia.contains(where: \.isNewline)
+        || child.previousToken(viewMode: .sourceAccurate)?.trailingTrivia.contains(where: \.isNewline) ?? false
+
+      if !startsOnNewline {
+        child.leadingTrivia = indentedNewline + child.leadingTrivia
+      }
       return child
     }
     decreaseIndentationLevel()

Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift

@@ -51,8 +51,8 @@ extension AccessorDeclSyntax {
       effectSpecifiers: effectSpecifiers,
       unexpectedBetweenEffectSpecifiersAndBody,
       body: bodyBuilder().map {
-      CodeBlockSyntax(statements: $0)
-    },
+        CodeBlockSyntax(statements: $0)
+      },
       unexpectedAfterBody,
       trailingTrivia: trailingTrivia
     )
@@ -344,8 +344,8 @@ extension DeinitializerDeclSyntax {
       effectSpecifiers: effectSpecifiers,
       unexpectedBetweenEffectSpecifiersAndBody,
       body: bodyBuilder().map {
-      CodeBlockSyntax(statements: $0)
-    },
+        CodeBlockSyntax(statements: $0)
+      },
       unexpectedAfterBody,
       trailingTrivia: trailingTrivia
     )
@@ -701,8 +701,8 @@ extension FunctionDeclSyntax {
       genericWhereClause: genericWhereClause,
       unexpectedBetweenGenericWhereClauseAndBody,
       body: bodyBuilder().map {
-      CodeBlockSyntax(statements: $0)
-    },
+        CodeBlockSyntax(statements: $0)
+      },
       unexpectedAfterBody,
       trailingTrivia: trailingTrivia
     )
@@ -947,8 +947,8 @@ extension InitializerDeclSyntax {
       genericWhereClause: genericWhereClause,
       unexpectedBetweenGenericWhereClauseAndBody,
       body: bodyBuilder().map {
-      CodeBlockSyntax(statements: $0)
-    },
+        CodeBlockSyntax(statements: $0)
+      },
       unexpectedAfterBody,
       trailingTrivia: trailingTrivia
     )

Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift

@@ -53,8 +53,8 @@ extension AccessorDeclSyntax {
       effectSpecifiers: effectSpecifiers,
       unexpectedBetweenEffectSpecifiersAndBody,
       body: bodyBuilder().map {
-      CodeBlockSyntax(statements: $0)
-    },
+        CodeBlockSyntax(statements: $0)
+      },
       unexpectedAfterBody,
       trailingTrivia: trailingTrivia
     )
@@ -415,8 +415,8 @@ extension FunctionDeclSyntax {
       genericWhereClause: genericWhereClause,
       unexpectedBetweenGenericWhereClauseAndBody,
       body: bodyBuilder().map {
-      CodeBlockSyntax(statements: $0)
-    },
+        CodeBlockSyntax(statements: $0)
+      },
       unexpectedAfterBody,
       trailingTrivia: trailingTrivia
     )