Fix initial indent for do and repeat.

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -433,7 +433,10 @@ private final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: RepeatWhileStmtSyntax) {
-    before(node.repeatKeyword, tokens: .reset, .open(.consistent, 0), .open(.inconsistent, 0))
+    // The zero-width space prevents the consistent group here from immediately following a break,
+    // which would cause all of the breaks immediately inside the group to fire.
+    before(
+      node.repeatKeyword, tokens: .space(size: 0), .open(.consistent, 0), .open(.inconsistent, 0))
     after(node.repeatKeyword, tokens: .space)
 
     arrangeBracesAndContents(of: node.body, contentsKeyPath: \.statements)
@@ -448,7 +451,9 @@ private final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: DoStmtSyntax) {
-    before(node.doKeyword, tokens: .reset, .open(.consistent, 0), .open(.inconsistent, 0))
+    // The zero-width space prevents the consistent group here from immediately following a break,
+    // which would cause all of the breaks immediately inside the group to fire.
+    before(node.doKeyword, tokens: .space(size: 0), .open(.consistent, 0), .open(.inconsistent, 0))
     after(node.doKeyword, tokens: .space)
 
     arrangeBracesAndContents(of: node.body, contentsKeyPath: \.statements)

Tests/SwiftFormatPrettyPrintTests/RepeatStmtTests.swift

@@ -45,4 +45,19 @@ public class RepeatStmtTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 25)
   }
+
+  public func testNestedRepeat() {
+    // Avoid regressions in the case where a nested `repeat` block was getting shifted all the way
+    // left.
+    let input = """
+      func foo() {
+        repeat {
+          bar()
+          baz()
+        }
+        while condition
+      }
+      """
+    assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 45)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/TryCatchTests.swift

@@ -93,4 +93,17 @@ public class TryCatchTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 45)
   }
+
+  public func testNestedDo() {
+    // Avoid regressions in the case where a nested `do` block was getting shifted all the way left.
+    let input = """
+      func foo() {
+        do {
+          bar()
+          baz()
+        }
+      }
+      """
+    assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 45)
+  }
 }