Merge pull request swiftlang#202 from google/format-tweaks-fix-blank-lines-after-comments

Fix extra blank lines after trailing comments in member decl blocks.

Author: dabelknap

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -811,7 +811,7 @@ private final class TokenStreamCreator: SyntaxVisitor {
     // reason.
     if node.members.count > 1 {
       for i in 0..<(node.members.count - 1) {
-        after(node.members[i].lastToken, tokens: .newline)
+        after(node.members[i].lastToken, tokens: .break(size: maxlinelength))
       }
     }
     super.visit(node)

Tests/SwiftFormatPrettyPrintTests/CommentTests.swift

@@ -384,4 +384,39 @@ public class CommentTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 45)
   }
+
+  public func testDoesNotInsertExtraNewlinesAfterTrailingComments() {
+    let input =
+      """
+      struct Foo {
+        var foo: Int  // foo
+        var bar: Int  // bar
+      }
+
+      enum Foo {
+        case foo
+        case bar  // bar
+        case baz  // baz
+        case quux
+      }
+      """
+    
+    let expected =
+      """
+      struct Foo {
+        var foo: Int  // foo
+        var bar: Int  // bar
+      }
+
+      enum Foo {
+        case foo
+        case bar  // bar
+        case baz  // baz
+        case quux
+      }
+
+      """
+    
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 100)
+  }
 }