Merge pull request #2851 from roopekv/fix-code-gen-newline-method-call-indentation

Author: ahoppen

CodeGeneration/Sources/Utils/CodeGenerationFormat.swift

@@ -96,6 +96,18 @@ public class CodeGenerationFormat: BasicFormat {
     let children = node.children(viewMode: .all)
     // Short tuple element list literals are presented on one line, list each element on a different line.
     if children.count > maxElementsOnSameLine {
+      let inMethodCallThatStartsOnNewline =
+        node.parent?.as(FunctionCallExprSyntax.self)?.calledExpression.as(MemberAccessExprSyntax.self)?.period
+        .startsOnNewline ?? false
+      if inMethodCallThatStartsOnNewline {
+        increaseIndentationLevel()
+      }
+      defer {
+        if inMethodCallThatStartsOnNewline {
+          decreaseIndentationLevel()
+        }
+      }
+
       return LabeledExprListSyntax(
         formatChildrenSeparatedByNewline(children: children, elementType: LabeledExprSyntax.self)
       )
@@ -111,10 +123,7 @@ public class CodeGenerationFormat: BasicFormat {
       if indentManually {
         return false
       }
-      let startsOnNewline =
-        node.leadingTrivia.contains(where: \.isNewline)
-        || node.previousToken(viewMode: .sourceAccurate)?.trailingTrivia.contains(where: \.isNewline) ?? false
-      if !startsOnNewline {
+      if !node.startsOnNewline {
         return false
       }
     default:
@@ -151,11 +160,7 @@ public class CodeGenerationFormat: BasicFormat {
       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 {
+      if !child.startsOnNewline {
         child.leadingTrivia = indentedNewline + child.leadingTrivia
       }
       return child
@@ -174,3 +179,10 @@ public class CodeGenerationFormat: BasicFormat {
     return formattedChildren
   }
 }
+
+private extension SyntaxProtocol {
+  var startsOnNewline: Bool {
+    return self.leadingTrivia.contains(where: \.isNewline)
+      || self.previousToken(viewMode: .sourceAccurate)?.trailingTrivia.contains(where: \.isNewline) ?? false
+  }
+}

Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift

@@ -369,11 +369,11 @@ public struct AccessorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _LeafDeclS
     }
     return Syntax(self)
       .replacingChild(
-      at: 1,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 1,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(AccessorDeclSyntax.self)
   }
 
@@ -918,11 +918,11 @@ public struct ActorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _LeafDeclSynt
     }
     return Syntax(self)
       .replacingChild(
-      at: 1,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 1,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(ActorDeclSyntax.self)
   }
 
@@ -964,11 +964,11 @@ public struct ActorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _LeafDeclSynt
     }
     return Syntax(self)
       .replacingChild(
-      at: 3,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 3,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(ActorDeclSyntax.self)
   }
 
@@ -1362,11 +1362,11 @@ public struct ArrayExprSyntax: ExprSyntaxProtocol, SyntaxHashable, _LeafExprSynt
     }
     return Syntax(self)
       .replacingChild(
-      at: 3,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 3,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(ArrayExprSyntax.self)
   }
 
@@ -2095,11 +2095,11 @@ public struct AssociatedTypeDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _Lea
     }
     return Syntax(self)
       .replacingChild(
-      at: 1,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 1,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(AssociatedTypeDeclSyntax.self)
   }
 
@@ -2141,11 +2141,11 @@ public struct AssociatedTypeDeclSyntax: DeclSyntaxProtocol, SyntaxHashable, _Lea
     }
     return Syntax(self)
       .replacingChild(
-      at: 3,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 3,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(AssociatedTypeDeclSyntax.self)
   }
 
@@ -3264,11 +3264,11 @@ public struct AttributedTypeSyntax: TypeSyntaxProtocol, SyntaxHashable, _LeafTyp
     }
     return Syntax(self)
       .replacingChild(
-      at: 1,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 1,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(AttributedTypeSyntax.self)
   }
 
@@ -3310,11 +3310,11 @@ public struct AttributedTypeSyntax: TypeSyntaxProtocol, SyntaxHashable, _LeafTyp
     }
     return Syntax(self)
       .replacingChild(
-      at: 3,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 3,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(AttributedTypeSyntax.self)
   }
 
@@ -3750,11 +3750,11 @@ public struct AvailabilityConditionSyntax: SyntaxProtocol, SyntaxHashable, _Leaf
     }
     return Syntax(self)
       .replacingChild(
-      at: 5,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 5,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(AvailabilityConditionSyntax.self)
   }
 
@@ -4309,11 +4309,11 @@ public struct BackDeployedAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashab
     }
     return Syntax(self)
       .replacingChild(
-      at: 5,
-      with: collection,
-      rawNodeArena: arena,
-      allocationArena: arena
-    )
+        at: 5,
+        with: collection,
+        rawNodeArena: arena,
+        allocationArena: arena
+      )
       .cast(BackDeployedAttributeArgumentsSyntax.self)
   }