Fix issue where forEach with 'guard ... else { return }' would be preserved unnecessarily

Author: calda

Sources/Rules.swift

@@ -7839,13 +7839,13 @@ public struct _FormatRules {
                     return
                 }
 
-                // We can convert `return`s to `continue`, but only when `return` is on its own line.
+                // We can convert `return`s to `continue`, but only when `return` is the last token in the scope.
                 // It's legal to write something like `return print("foo")` in a `forEach` as long as
                 // you're still returning a `Void` value. Since `continue print("foo")` isn't legal,
                 // we should just ignore this closure.
                 if formatter.tokens[closureBodyIndex] == .keyword("return"),
                    let tokenAfterReturnKeyword = formatter.next(.nonSpaceOrComment, after: closureBodyIndex),
-                   !tokenAfterReturnKeyword.isLinebreak
+                   !(tokenAfterReturnKeyword.isLinebreak || tokenAfterReturnKeyword == .endOfScope("}"))
                 {
                     return
                 }

Tests/RulesTests+Syntax.swift

@@ -4959,4 +4959,23 @@ class SyntaxTests: RulesTests {
 
         testFormatting(for: input, output, rule: FormatRules.preferForLoop)
     }
+
+    func testConvertsForEachWithGuardElseReturn() {
+        let input = """
+        strings.forEach { string in
+            guard !string.isEmpty else { return }
+            print(string)
+        }
+        """
+
+        let output = """
+        for string in strings {
+            guard !string.isEmpty else { continue }
+            print(string)
+        }
+        """
+
+        testFormatting(for: input, output, rule: FormatRules.preferForLoop,
+                       exclude: ["wrapConditionalBodies"])
+    }
 }