Merge pull request swiftlang#2833 from roopekv/fix-code-gen-list-format-indentation

Fix `CodeGenerationFormat` to not add extra indentation, leave trailing spaces when adding newlines, or indent empty lines

Author: ahoppen

CodeGeneration/Sources/Utils/CodeGenerationFormat.swift

@@ -104,6 +104,25 @@ public class CodeGenerationFormat: BasicFormat {
     }
   }
 
+  public override func requiresIndent(_ node: some SyntaxProtocol) -> Bool {
+    switch node.kind {
+    case .arrayElementList, .dictionaryElementList, .functionParameterList, .labeledExprList:
+      let indentManually = node.children(viewMode: .sourceAccurate).count > maxElementsOnSameLine
+      if indentManually {
+        return false
+      }
+      let startsOnNewline =
+        node.leadingTrivia.contains(where: \.isNewline)
+        || node.previousToken(viewMode: .sourceAccurate)?.trailingTrivia.contains(where: \.isNewline) ?? false
+      if !startsOnNewline {
+        return false
+      }
+    default:
+      break
+    }
+    return super.requiresIndent(node)
+  }
+
   // MARK: - Private
 
   private func shouldBeSeparatedByTwoNewlines(node: CodeBlockItemSyntax) -> Bool {
@@ -114,9 +133,9 @@ public class CodeGenerationFormat: BasicFormat {
 
   private func ensuringTwoLeadingNewlines<NodeType: SyntaxProtocol>(node: NodeType) -> NodeType {
     if node.leadingTrivia.first?.isNewline ?? false {
-      return node.with(\.leadingTrivia, indentedNewline + node.leadingTrivia)
+      return node.with(\.leadingTrivia, .newline + node.leadingTrivia)
     } else {
-      return node.with(\.leadingTrivia, indentedNewline + indentedNewline + node.leadingTrivia)
+      return node.with(\.leadingTrivia, .newlines(2) + node.leadingTrivia)
     }
   }
 
@@ -126,14 +145,20 @@ public class CodeGenerationFormat: BasicFormat {
   ) -> [SyntaxType] {
     increaseIndentationLevel()
     var formattedChildren = children.map {
-      self.rewrite($0.cast(SyntaxType.self)).cast(SyntaxType.self)
+      return self.rewrite($0.cast(SyntaxType.self)).cast(SyntaxType.self)
     }
-    formattedChildren = formattedChildren.map {
-      if $0.leadingTrivia.first?.isNewline == true {
-        return $0
-      } else {
-        return $0.with(\.leadingTrivia, indentedNewline + $0.leadingTrivia)
+    formattedChildren = formattedChildren.map { child in
+      var child = child
+      child.trailingTrivia = Trivia(pieces: child.trailingTrivia.drop(while: \.isSpaceOrTab))
+
+      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()
     if let lastChild = formattedChildren.last {

Sources/SwiftParser/generated/ExperimentalFeatures.swift

@@ -16,7 +16,7 @@ extension Parser {
   @_spi(ExperimentalLanguageFeatures)
   public struct ExperimentalFeatures: OptionSet, Sendable {
     public let rawValue: UInt
-    
+
     public init(rawValue: UInt) {
       self.rawValue = rawValue
     }
@@ -26,16 +26,16 @@ extension Parser {
 extension Parser.ExperimentalFeatures {
   /// Whether to enable the parsing of reference bindings.
   public static let referenceBindings = Self (rawValue: 1 << 0)
-  
+
   /// Whether to enable the parsing of 'then' statements.
   public static let thenStatements = Self (rawValue: 1 << 1)
-  
+
   /// Whether to enable the parsing of 'do' expressions.
   public static let doExpressions = Self (rawValue: 1 << 2)
-  
+
   /// Whether to enable the parsing of NonEscableTypes.
   public static let nonescapableTypes = Self (rawValue: 1 << 3)
-  
+
   /// Whether to enable the parsing of trailing comma.
   public static let trailingComma = Self (rawValue: 1 << 4)
 }

Sources/SwiftParser/generated/LayoutNodes+Parsable.swift

@@ -383,7 +383,7 @@ fileprivate extension Parser {
     }
     return node
   }
-  
+
   mutating func parseExpression() -> RawExprSyntax {
     return self.parseExpression(flavor: .basic, pattern: .none)
   }