Merge pull request swiftlang#188 from google/format-spaces-in-single-member-types

Ensure a space inside braces in a single member type decl.

Author: dabelknap

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -172,9 +172,9 @@ private final class TokenStreamCreator: SyntaxVisitor {
     if !members.members.isEmpty {
       after(
         members.leftBrace,
-        tokens: .close, .close, .break(size: 0, offset: 2), .open(.consistent, 0)
+        tokens: .close, .close, .break(size: 1, offset: 2), .open(.consistent, 0)
       )
-      before(members.rightBrace, tokens: .break(size: 0, offset: -2), .close)
+      before(members.rightBrace, tokens: .break(size: 1, offset: -2), .close)
     } else {
       // The size-0 break in the empty case allows for a break between the braces in the rare event
       // that the declaration would be exactly the column limit + 1.

Tests/SwiftFormatPrettyPrintTests/ClassDeclTests.swift

@@ -290,4 +290,9 @@ public class ClassDeclTests: PrettyPrintTestCase {
       """
     assertPrettyPrintEqual(input: input, expected: wrapped, linelength: 11)
   }
+
+  public func testOneMemberClass() {
+    let input = "class Foo { var bar: Int }"
+    assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 50)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/EnumDeclTests.swift

@@ -369,4 +369,9 @@ public class EnumDeclTests: PrettyPrintTestCase {
       """
     assertPrettyPrintEqual(input: input, expected: wrapped, linelength: 10)
   }
+
+  public func testOneMemberEnum() {
+    let input = "enum Foo { var bar: Int }"
+    assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 50)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/ExtensionDeclTests.swift

@@ -245,4 +245,9 @@ public class ExtensionDeclTests: PrettyPrintTestCase {
       """
     assertPrettyPrintEqual(input: input, expected: wrapped, linelength: 15)
   }
+
+  public func testOneMemberExtension() {
+    let input = "extension Foo { var bar: Int { return 0 } }"
+    assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 50)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/ProtocolDeclTests.swift

@@ -238,4 +238,9 @@ public class ProtocolDeclTests: PrettyPrintTestCase {
       """
     assertPrettyPrintEqual(input: input, expected: wrapped, linelength: 14)
   }
+
+  public func testOneMemberProtocol() {
+    let input = "protocol Foo { var bar: Int { get } }"
+    assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 50)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/StructDeclTests.swift

@@ -290,4 +290,9 @@ public class StructDeclTests: PrettyPrintTestCase {
       """
     assertPrettyPrintEqual(input: input, expected: wrapped, linelength: 12)
   }
+
+  public func testOneMemberStruct() {
+    let input = "struct Foo { var bar: Int }"
+    assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 50)
+  }
 }