Merge pull request swiftlang#123 from dabelknap/fix-indents

Fix issue where multiple nested groups could have runaway indentation

Author: allevato

Sources/PrettyPrint/PrettyPrint.swift

@@ -59,6 +59,10 @@ public class PrettyPrinter {
   /// Keep track of the indentation level of the current group as the number of blank spaces.
   private var indentStack = [0]
 
+  /// Keep track of the offset value passed to a group. This is used to adjust the offset value of
+  /// any trailing break statements in the group.
+  private var relativeIndentStack = [0]
+
   /// Keep track of whether we are forcing breaks within a group (for consistent breaking).
   private var forceBreakStack = [false]
 
@@ -126,14 +130,16 @@ public class PrettyPrinter {
       // incremented from the outer group's indent.
       let indentValue = indentStack.last ?? 0
       indentStack.append(indentValue + offset + lastBreakOffset)
+      relativeIndentStack.append(offset + lastBreakOffset)
       lastBreakOffset = 0
 
     case .close:
       if isDebugMode {
         writeCloseGroupDebugMarker()
       }
       forceBreakStack.removeLast()
-      let indentValue = indentStack.popLast() ?? 0
+      indentStack.removeLast()
+      let indentValue = relativeIndentStack.popLast() ?? 0
       // The offset of the last break needs to be adjusted according to its parent group. This is so
       // the next open token's indent is initialized with the correct value.
       lastBreakOffset += indentValue
@@ -176,13 +182,16 @@ public class PrettyPrinter {
 
     // Print out the number of spaces according to the size, and adjust spaceRemaining.
     case .space(let size):
-      spaceRemaining -= size
-      writeSpaces(size + lastBreakValue)
+      if lastBreakConsecutive {
+        writeSpaces(lastBreakValue)
 
-      lastBreak = false
-      lastBreakConsecutive = false
-      lastBreakOffset = 0
-      lastBreakValue = 0
+        lastBreak = false
+        lastBreakConsecutive = false
+        lastBreakOffset = 0
+        lastBreakValue = 0
+      }
+      spaceRemaining -= size
+      writeSpaces(size)
 
     // Apply N line breaks, calculate the indentation required, and adjust spaceRemaining.
     case .newlines(let N, let offset):

Sources/PrettyPrint/TokenStreamCreator.swift

@@ -463,6 +463,7 @@ private final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: BreakStmtSyntax) {
+    before(node.label, tokens: .break(offset: 2))
     super.visit(node)
   }
 

Tests/PrettyPrinterTests/SwitchStmtTests.swift

@@ -74,4 +74,39 @@ public class SwitchStmtTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 35)
   }
+
+  public func testNestedSwitch() {
+    let input =
+      """
+      myloop: while a != b {
+        switch a + b {
+        case firstValue:
+          break myloop
+        case secondVale:
+          let c = 123
+          var d = 456
+        default:
+          a += b
+        }
+      }
+      """
+
+    let expected =
+      """
+      myloop: while a != b {
+        switch a + b {
+        case firstValue:
+          break myloop
+        case secondVale:
+          let c = 123
+          var d = 456
+        default:
+          a += b
+        }
+      }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 35)
+  }
 }