Fix regression in wrapMultilineStatementBraces rule from bad isStartO…

…fClosure result
nicklockwood · Sep 30, 2024 · c5b089c · c5b089c
1 parent be3df7b
commit c5b089c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/Sources/ParsingHelpers.swift b/Sources/ParsingHelpers.swift
@@ -571,13 +571,7 @@ extension Formatter {
                 }
                 return last(.nonSpaceOrCommentOrLinebreak, before: prevIndex) != .keyword("func")
             default:
-                if let nextIndex = index(of: .nonSpaceOrCommentOrLinebreak, after: i),
-                   isAccessorKeyword(at: nextIndex) || isAccessorKeyword(at: prevIndex)
-                {
-                    return false
-                } else {
-                    return !isConditionalStatement(at: startOfScope)
-                }
+                return false
             }
             fallthrough
         case .identifier, .number, .operator("?", .postfix), .operator("!", .postfix),

diff --git a/Tests/Rules/WrapMultilineStatementBracesTests.swift b/Tests/Rules/WrapMultilineStatementBracesTests.swift
@@ -703,4 +703,25 @@ class WrapMultilineStatementBracesTests: XCTestCase {
         testFormatting(for: input, rules: [.wrapMultilineStatementBraces, .wrap],
                        options: options, exclude: [.indent, .redundantClosure, .wrapConditionalBodies])
     }
+
+    func testWrapMultilineStatementBraceAfterWhereClauseWithTuple() {
+        let input = """
+        extension Foo {
+            public func testWithWhereClause<A, B, Outcome>(
+                a: A,
+                b: B)
+                -> Outcome where
+                Outcome == (A, B)
+            {
+                return (a, b)
+            }
+        }
+        """
+
+        let options = FormatOptions(
+            wrapArguments: .beforeFirst,
+            closingParenPosition: .sameLine
+        )
+        testFormatting(for: input, rules: [.wrapMultilineStatementBraces, .braces], options: options)
+    }
 }