Merge pull request #412 from allevato/recent-main-fixes

Fix recent breakages due to changes in swift-syntax main.

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -764,7 +764,9 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: YieldStmtSyntax) -> SyntaxVisitorContinueKind {
-    after(node.yieldKeyword, tokens: .break)
+    // As of https://github.com/apple/swift-syntax/pull/895, the token following a `yield` keyword
+    // *must* be on the same line, so we cannot break here.
+    after(node.yieldKeyword, tokens: .space)
     return .visitChildren
   }
 
@@ -1641,10 +1643,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
     return .visitChildren
   }
 
-  override func visit(_ node: ElseBlockSyntax) -> SyntaxVisitorContinueKind {
-    return .visitChildren
-  }
-
   override func visit(_ node: ConditionElementSyntax) -> SyntaxVisitorContinueKind {
     before(node.firstToken, tokens: .open)
     if let comma = node.trailingComma {
@@ -2178,10 +2176,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
     return .visitChildren
   }
 
-  override func visit(_ node: ElseIfContinuationSyntax) -> SyntaxVisitorContinueKind {
-    return .visitChildren
-  }
-
   override func visit(_ node: GenericWhereClauseSyntax) -> SyntaxVisitorContinueKind {
     guard node.whereKeyword != node.lastToken else {
       verbatimToken(Syntax(node))

Tests/SwiftFormatPrettyPrintTests/YieldStmtTests.swift

@@ -17,14 +17,12 @@ final class YieldStmtTests: PrettyPrintTestCase {
       """
       var foo: Int {
         _read {
-          yield
-            1234567890
+          yield 1234567890
         }
         _modify {
           var someLongVariable =
             0
-          yield
-            &someLongVariable
+          yield &someLongVariable
         }
       }