Merge pull request swiftlang#8 from allevato/sr-11107

Indent line comments correctly when they precede a continuation line.

Author: allevato

Sources/SwiftFormatPrettyPrint/PrettyPrint.swift

@@ -313,7 +313,6 @@ public class PrettyPrinter {
       spaceRemaining -= text.count
 
     case .comment(let comment, let wasEndOfLine):
-      currentLineIsContinuation = false
       lastBreak = false
 
       write(comment.print(indent: currentIndentation))

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -881,13 +881,12 @@ private final class TokenStreamCreator: SyntaxVisitor {
   }
 
   func visit(_ node: CodeBlockItemListSyntax) -> SyntaxVisitorContinueKind {
-    insertTokens(.break(.reset, size: 0), .newline, betweenElementsOf: node)
     return .visitChildren
   }
 
   func visit(_ node: CodeBlockItemSyntax) -> SyntaxVisitorContinueKind {
     before(node.firstToken, tokens: .open)
-    after(node.lastToken, tokens: .close)
+    after(node.lastToken, tokens: .close, .break(.reset, size: 0))
     return .visitChildren
   }
 

Tests/SwiftFormatPrettyPrintTests/CommentTests.swift

@@ -416,4 +416,17 @@ public class CommentTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 100)
   }
+
+  public func testCommentOnContinuationLine() {
+    let input =
+      """
+      func foo() {
+        return true
+          // comment
+          && false
+      }
+      """
+
+    assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 60)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/XCTestManifests.swift

@@ -103,6 +103,7 @@ extension CommentTests {
     // to regenerate.
     static let __allTests__CommentTests = [
         ("testBlockComments", testBlockComments),
+        ("testCommentOnContinuationLine", testCommentOnContinuationLine),
         ("testContainerLineComments", testContainerLineComments),
         ("testDocumentationBlockComments", testDocumentationBlockComments),
         ("testDocumentationComments", testDocumentationComments),