Force breaking in repeat body when while condition is too long.

Repeat-while-stmt is intended to keep the right brace next to the `while` token, like if-else statements. Previously, there wasn't a group so the pretty printer was allowing the repeat body to not have any breaks when the while condition overflowed the line.

Author: dylansturg

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -533,11 +533,19 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
   override func visit(_ node: RepeatWhileStmtSyntax) -> SyntaxVisitorContinueKind {
     arrangeBracesAndContents(of: node.body, contentsKeyPath: \.statements)
 
-    let whilePrecedingBreak = config.lineBreakBeforeControlFlowKeywords
-      ? Token.break(.same) : Token.space
-    before(node.whileKeyword, tokens: whilePrecedingBreak)
+    if config.lineBreakBeforeControlFlowKeywords {
+      before(node.whileKeyword, tokens: .break(.same), .open)
+      after(node.condition.lastToken, tokens: .close)
+    } else {
+      // The length of the condition needs to force the breaks around the braces of the repeat
+      // stmt's body, so that there's always a break before the right brace when the while &
+      // condition is too long to be on one line.
+      before(node.whileKeyword, tokens: .space)
+      // The `open` token occurs after the ending tokens for the braced `body` node.
+      before(node.body.rightBrace, tokens: .open)
+      after(node.condition.lastToken, tokens: .close)
+    }
     after(node.whileKeyword, tokens: .space)
-
     return .visitChildren
   }
 

Tests/SwiftFormatPrettyPrintTests/RepeatStmtTests.swift

@@ -10,6 +10,10 @@ final class RepeatStmtTests: PrettyPrintTestCase {
       while x
       repeat { foo() }
       while longcondition
+      repeat { f() }
+      while long.condition
+      repeat { f() } while long.condition
+      repeat { f() } while long.condition.that.ison.many.lines
       repeat {
         let a = 123
         var b = "abc"
@@ -29,6 +33,16 @@ final class RepeatStmtTests: PrettyPrintTestCase {
       repeat {
         foo()
       } while longcondition
+      repeat {
+        f()
+      } while long.condition
+      repeat {
+        f()
+      } while long.condition
+      repeat {
+        f()
+      } while long.condition
+        .that.ison.many.lines
       repeat {
         let a = 123
         var b = "abc"
@@ -50,6 +64,10 @@ final class RepeatStmtTests: PrettyPrintTestCase {
       repeat {} while x
       repeat { f() } while x
       repeat { foo() } while longcondition
+      repeat { f() }
+      while long.condition
+      repeat { f() } while long.condition
+      repeat { f() } while long.condition.that.ison.many.lines
       repeat {
         let a = 123
         var b = "abc"
@@ -68,6 +86,13 @@ final class RepeatStmtTests: PrettyPrintTestCase {
       repeat { f() } while x
       repeat { foo() }
       while longcondition
+      repeat { f() }
+      while long.condition
+      repeat { f() }
+      while long.condition
+      repeat { f() }
+      while long.condition.that
+        .ison.many.lines
       repeat {
         let a = 123
         var b = "abc"