Fix allman inference

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

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/Sources/Inference.swift b/Sources/Inference.swift
@@ -265,6 +265,12 @@ private struct Inference {
             else {
                 return
             }
+            // Ignore wrapped if/else/guard
+            if let keyword = formatter.lastSignificantKeyword(at: i - 1, excluding: ["else"]),
+               ["if", "guard", "while", "let", "var", "case"].contains(keyword)
+            {
+                return
+            }
             // Check if brace is wrapped
             if let prevTokenIndex = formatter.index(of: .nonSpace, before: i),
                let prevToken = formatter.token(at: prevTokenIndex)

diff --git a/Tests/RulesTests+Wrapping.swift b/Tests/RulesTests+Wrapping.swift
@@ -70,6 +70,45 @@ extension RulesTests {
         testFormatting(for: input, rule: FormatRules.elseOnSameLine)
     }
 
+    func testElseOnSameLineInferenceEdgeCase() {
+        let input = """
+        func foo() {
+            if let foo == bar {
+                // ...
+            } else {
+                // ...
+            }
+
+            if let foo == bar,
+               let baz = quux
+            {
+                print()
+            }
+
+            if let foo == bar,
+               let baz = quux
+            {
+                print()
+            }
+
+            if let foo == bar,
+               let baz = quux
+            {
+                print()
+            }
+
+            if let foo == bar,
+               let baz = quux
+            {
+                print()
+            }
+        }
+        """
+        let options = FormatOptions(elseOnNextLine: false)
+        testFormatting(for: input, rule: FormatRules.elseOnSameLine, options: options,
+                       exclude: ["braces"])
+    }
+
     // guardelse = auto
 
     func testSingleLineGuardElseNotWrappedByDefault() {

diff --git a/Tests/XCTestManifests.swift b/Tests/XCTestManifests.swift
@@ -721,6 +721,7 @@ extension RulesTests {
         ("testElseOnNextLineOption", testElseOnNextLineOption),
         ("testElseOnSameLine", testElseOnSameLine),
         ("testElseOnSameLineDoesntEatPreviousStatement", testElseOnSameLineDoesntEatPreviousStatement),
+        ("testElseOnSameLineInferenceEdgeCase", testElseOnSameLineInferenceEdgeCase),
         ("testElseOnSameLineOnlyAppliedToDanglingBrace", testElseOnSameLineOnlyAppliedToDanglingBrace),
         ("testEmptyBracesNotRemovedInDoCatch", testEmptyBracesNotRemovedInDoCatch),
         ("testEmptyBracesNotRemovedInIfElse", testEmptyBracesNotRemovedInIfElse),