Merge pull request swiftlang#9 from allevato/sr-11116

Ensure line breaks between type members wrapped in an `#if` block.

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -819,7 +819,11 @@ private final class TokenStreamCreator: SyntaxVisitor {
   }
 
   func visit(_ node: MemberDeclBlockSyntax) -> SyntaxVisitorContinueKind {
-    insertTokens(.break(.reset, size: 0), .newline, betweenElementsOf: node.members)
+    return .visitChildren
+  }
+
+  func visit(_ node: MemberDeclListSyntax) -> SyntaxVisitorContinueKind {
+    insertTokens(.break(.reset, size: 0), .newline, betweenElementsOf: node)
     return .visitChildren
   }
 

Tests/SwiftFormatPrettyPrintTests/IfConfigTests.swift

@@ -55,4 +55,29 @@ public class IfConfigTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 45)
   }
+
+  public func testPoundIfAroundMembers() {
+    let input =
+      """
+      class Foo {
+      #if DEBUG
+        var bar: String
+        var baz: String
+      #endif
+      }
+      """
+
+    let expected =
+      """
+      class Foo {
+        #if DEBUG
+          var bar: String
+          var baz: String
+        #endif
+      }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 45)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/XCTestManifests.swift

@@ -248,6 +248,7 @@ extension IfConfigTests {
     // to regenerate.
     static let __allTests__IfConfigTests = [
         ("testBasicIfConfig", testBasicIfConfig),
+        ("testPoundIfAroundMembers", testPoundIfAroundMembers),
     ]
 }