Unwrap closure braces

nicklockwood · Nov 9, 2020 · e0dd5c7 · e0dd5c7
1 parent 7f07e1e
commit e0dd5c7
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 14 deletions.
diff --git a/Sources/Rules.swift b/Sources/Rules.swift
@@ -1640,21 +1640,21 @@ public struct _FormatRules {
                 else {
                     return
                 }
-                let maxWidth = formatter.options.maxWidth
+
+                var maxWidth = formatter.options.maxWidth
                 if maxWidth == 0 {
-                    // Check that brace doesn't have inline content after it
-                    guard formatter.next(.nonSpace, after: i)?.isLinebreak == true else {
-                        return
-                    }
-                } else {
-                    // Check that unwrapping wouldn't exceed line length
-                    let endOfLine = formatter.endOfLine(at: i)
-                    let length = formatter.lineLength(from: i, upTo: endOfLine)
-                    let prevLineLength = formatter.lineLength(at: prevIndex)
-                    guard prevLineLength + length + 1 <= maxWidth else {
-                        return
-                    }
+                    // Set reasonable default
+                    maxWidth = 100
                 }
+
+                // Check that unwrapping wouldn't exceed line length
+                let endOfLine = formatter.endOfLine(at: i)
+                let length = formatter.lineLength(from: i, upTo: endOfLine)
+                let prevLineLength = formatter.lineLength(at: prevIndex)
+                guard prevLineLength + length + 1 <= maxWidth else {
+                    return
+                }
+
                 // Avoid conflicts with wrapMultilineStatementBraces
                 // TODO: find a better solution for this
                 if let keywordIndex =

diff --git a/Tests/RulesTests+Braces.swift b/Tests/RulesTests+Braces.swift
@@ -119,6 +119,32 @@ extension RulesTests {
         testFormatting(for: input, rule: FormatRules.braces, options: options)
     }
 
+    func testKnRUnwrapClosure() {
+        let input = """
+        let foo =
+        { bar in
+            bar()
+        }
+        """
+        let output = """
+        let foo = { bar in
+            bar()
+        }
+        """
+        testFormatting(for: input, output, rule: FormatRules.braces)
+    }
+
+    func testKnRNoUnwrapClosureIfWidthExceeded() {
+        let input = """
+        let foo =
+        { bar in
+            bar()
+        }
+        """
+        let options = FormatOptions(maxWidth: 15)
+        testFormatting(for: input, rule: FormatRules.braces, options: options, exclude: ["indent"])
+    }
+
     func testKnRClosingBraceWrapped() {
         let input = "func foo() {\n    print(bar) }"
         let output = "func foo() {\n    print(bar)\n}"

diff --git a/Tests/RulesTests+Indentation.swift b/Tests/RulesTests+Indentation.swift
@@ -1232,7 +1232,7 @@ extension RulesTests {
         }
         """
         let options = FormatOptions(wrapArguments: .disabled, closingParenOnSameLine: true)
-        testFormatting(for: input, rule: FormatRules.indent, options: options)
+        testFormatting(for: input, rule: FormatRules.indent, options: options, exclude: ["braces"])
     }
 
     func testSingleIndentTrailingClosureBodyOfShortMethod() {

diff --git a/Tests/XCTestManifests.swift b/Tests/XCTestManifests.swift
@@ -968,6 +968,8 @@ extension RulesTests {
         ("testKnRNoMangleClosureReturningClosure", testKnRNoMangleClosureReturningClosure),
         ("testKnRNoMangleClosureReturningClosure2", testKnRNoMangleClosureReturningClosure2),
         ("testKnRNoMangleCommentBeforeClosure", testKnRNoMangleCommentBeforeClosure),
+        ("testKnRNoUnwrapClosureIfWidthExceeded", testKnRNoUnwrapClosureIfWidthExceeded),
+        ("testKnRUnwrapClosure", testKnRUnwrapClosure),
         ("testLabeledTupleYodaCondition", testLabeledTupleYodaCondition),
         ("testLabelsAreNotArguments", testLabelsAreNotArguments),
         ("testLeadingColonFollowedByCommentMovedToPreviousLine", testLeadingColonFollowedByCommentMovedToPreviousLine),