Add breaks around conditions of while-stmt.

This aligns the behavior of while-stmt and guard-stmt conditions. The while-stmt conditions didn't have open-breaks, which meant there was no additional indentation nor would continuation breaks be able to stack.

This means there's always a break before the first token of the condition element list when the while-stmt's condition is multiple lines. That is likely to cause some churn in existing code. An alternative would be to treat this like if-stmt, where there is no break after the while token.

Author: dylansturg

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -526,6 +526,13 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
     after(node.labelColon, tokens: .space)
     after(node.whileKeyword, tokens: .space)
 
+    // Add break groups, using open continuation breaks, around all conditions so that continuations
+    // inside of the conditions can stack in addition to continuations between the conditions.
+    for condition in node.conditions {
+      before(condition.firstToken, tokens: .break(.open(kind: .continuation), size: 0))
+      after(condition.lastToken, tokens: .break(.close(mustBreak: false), size: 0))
+    }
+
     arrangeBracesAndContents(of: node.body, contentsKeyPath: \.statements)
 
     return .visitChildren

Tests/SwiftFormatPrettyPrintTests/WhileStmtTests.swift

@@ -35,9 +35,10 @@ final class WhileStmtTests: PrettyPrintTestCase {
         let a = 123
         var b = "abc"
       }
-      while condition1
-        && condition2
-        || condition3
+      while
+        condition1
+          && condition2
+          || condition3
       {
         let a = 123
         var b = "abc"
@@ -76,9 +77,10 @@ final class WhileStmtTests: PrettyPrintTestCase {
         let a = 123
         var b = "abc"
       }
-      myLabel: while condition1
-        && condition2 || condition3
-        || condition4
+      myLabel: while
+        condition1 && condition2
+          || condition3
+          || condition4
       {
         let a = 123
         var b = "abc"
@@ -88,4 +90,49 @@ final class WhileStmtTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 29)
   }
+
+  func testWhileLoopMultipleConditionElements() {
+    let input =
+      """
+      while x >= 0 && y >= 0 && x < foo && y < bar, let object = foo.value(at: y), let otherObject = foo.value(at: x), isEqual(a, b) {
+        foo()
+      }
+      while x >= 0 && y >= 0
+      && x < foo && y < bar,
+      let object =
+      foo.value(at: y),
+      let otherObject = foo.value(at: x), isEqual(a, b) {
+        foo()
+      }
+      """
+
+    let expected =
+      """
+      while
+        x >= 0 && y >= 0 && x < foo
+          && y < bar,
+        let object = foo.value(
+          at: y),
+        let otherObject =
+          foo.value(at: x),
+        isEqual(a, b)
+      {
+        foo()
+      }
+      while
+        x >= 0 && y >= 0
+          && x < foo && y < bar,
+        let object =
+          foo.value(at: y),
+        let otherObject =
+          foo.value(at: x),
+        isEqual(a, b)
+      {
+        foo()
+      }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 29)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/XCTestManifests.swift

@@ -493,6 +493,7 @@ extension NewlineTests {
     static let __allTests__NewlineTests = [
         ("testLeadingNewlines", testLeadingNewlines),
         ("testLeadingNewlinesWithComments", testLeadingNewlinesWithComments),
+        ("testNewlinesBetweenMembers", testNewlinesBetweenMembers),
         ("testTrailingNewlines", testTrailingNewlines),
         ("testTrailingNewlinesWithComments", testTrailingNewlinesWithComments),
     ]
@@ -802,6 +803,7 @@ extension WhileStmtTests {
     static let __allTests__WhileStmtTests = [
         ("testBasicWhileLoops", testBasicWhileLoops),
         ("testLabeledWhileLoops", testLabeledWhileLoops),
+        ("testWhileLoopMultipleConditionElements", testWhileLoopMultipleConditionElements),
     ]
 }