Fix isEnumCase helper bug

Author: nicklockwood

Sources/ParsingHelpers.swift

@@ -838,10 +838,12 @@ extension Formatter {
 
     func isEnumCase(at i: Int) -> Bool {
         assert(tokens[i] == .keyword("case"))
-        if last(.keyword, before: i) == .keyword("case") {
+        switch last(.nonSpaceOrCommentOrLinebreak, before: i) {
+        case .identifier?, .endOfScope(")")?, .startOfScope("{")?:
             return true
+        default:
+            return false
         }
-        return last(.nonSpaceOrCommentOrLinebreak, before: i) == .startOfScope("{")
     }
 
     struct ImportRange: Comparable {

Tests/ParsingHelpersTests.swift

@@ -573,13 +573,50 @@ class ParsingHelpersTests: XCTestCase {
         XCTAssert(formatter.isEnumCase(at: 15))
     }
 
+    func testIsEnumCaseWithValue() {
+        let formatter = Formatter(tokenize("""
+        enum Foo {
+            case foo, bar(Int)
+            case baz
+        }
+        """))
+        XCTAssert(formatter.isEnumCase(at: 7))
+        XCTAssert(formatter.isEnumCase(at: 18))
+    }
+
     func testIsNotEnumCase() {
+        let formatter = Formatter(tokenize("""
+        if case let .foo(bar) = baz {}
+        """))
+        XCTAssertFalse(formatter.isEnumCase(at: 2))
+    }
+
+    func testTypoIsNotEnumCase() {
         let formatter = Formatter(tokenize("""
         if let case .foo(bar) = baz {}
         """))
         XCTAssertFalse(formatter.isEnumCase(at: 4))
     }
 
+    func testMixedCaseTypes() {
+        let formatter = Formatter(tokenize("""
+        enum Foo {
+            case foo
+            case bar(value: [Int])
+        }
+
+        func baz() {
+            if case .foo = foo,
+               case .bar(let value) = bar,
+               value.isEmpty {}
+        }
+        """))
+        XCTAssert(formatter.isEnumCase(at: 7))
+        XCTAssert(formatter.isEnumCase(at: 12))
+        XCTAssertFalse(formatter.isEnumCase(at: 38))
+        XCTAssertFalse(formatter.isEnumCase(at: 49))
+    }
+
     // MARK: modifierOrder
 
     func testModifierOrder() {

Tests/RulesTests+Wrapping.swift

@@ -2777,6 +2777,26 @@ extension RulesTests {
         testFormatting(for: input, rule: FormatRules.wrapEnumCases)
     }
 
+    func testNoConfuseIfCaseWithEnum() {
+        let input = """
+        enum Foo {
+            case foo
+            case bar(value: [Int])
+        }
+
+        func baz() {
+            if case .foo = foo,
+               case .bar(let value) = bar,
+               value.isEmpty
+            {
+                print("")
+            }
+        }
+        """
+        testFormatting(for: input, rule: FormatRules.wrapEnumCases,
+                       exclude: ["hoistPatternLet"])
+    }
+
     // MARK: wrapSwitchCases
 
     func testMultilineSwitchCases() {

Tests/XCTestManifests.swift

@@ -384,7 +384,9 @@ extension ParsingHelpersTests {
         ("testInitAllmanBracesNotTreatedAsClosure", testInitAllmanBracesNotTreatedAsClosure),
         ("testInitBracesNotTreatedAsClosure", testInitBracesNotTreatedAsClosure),
         ("testIsEnumCase", testIsEnumCase),
+        ("testIsEnumCaseWithValue", testIsEnumCaseWithValue),
         ("testIsNotEnumCase", testIsNotEnumCase),
+        ("testMixedCaseTypes", testMixedCaseTypes),
         ("testModifierOrder", testModifierOrder),
         ("testModifierOrder2", testModifierOrder2),
         ("testMultipleNestedTrailingClosures", testMultipleNestedTrailingClosures),
@@ -437,6 +439,7 @@ extension ParsingHelpersTests {
         ("testThrowingFunctionWithWhereClauseBracesNotTreatedAsClosure", testThrowingFunctionWithWhereClauseBracesNotTreatedAsClosure),
         ("testTupleReturningFunctionBracesNotTreatedAsClosure", testTupleReturningFunctionBracesNotTreatedAsClosure),
         ("testTypedVarAssignmentBracesTreatedAsClosure", testTypedVarAssignmentBracesTreatedAsClosure),
+        ("testTypoIsNotEnumCase", testTypoIsNotEnumCase),
         ("testVarAssignmentBracesTreatedAsClosure", testVarAssignmentBracesTreatedAsClosure),
         ("testVarAssignmentBracesTreatedAsClosure2", testVarAssignmentBracesTreatedAsClosure2),
         ("testVarDidSetBracesNotTreatedAsClosure", testVarDidSetBracesNotTreatedAsClosure),
@@ -1153,6 +1156,7 @@ extension RulesTests {
         ("testNoBlanksInsideClassFunc", testNoBlanksInsideClassFunc),
         ("testNoBlanksInsideClassVar", testNoBlanksInsideClassVar),
         ("testNoConfuseCaseWithModifier", testNoConfuseCaseWithModifier),
+        ("testNoConfuseIfCaseWithEnum", testNoConfuseIfCaseWithEnum),
         ("testNoConfusePostfixIdentifierWithKeyword", testNoConfusePostfixIdentifierWithKeyword),
         ("testNoConfusePostfixIdentifierWithKeyword2", testNoConfusePostfixIdentifierWithKeyword2),
         ("testNoConvertVoidSelfToTuple", testNoConvertVoidSelfToTuple),