Fix more bugs with unhoisting pattern let

nicklockwood · Nov 14, 2020 · d5bb6fa · d5bb6fa
1 parent c34c916
commit d5bb6fa
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/Sources/Rules.swift b/Sources/Rules.swift
@@ -3337,21 +3337,27 @@ public struct _FormatRules {
             // Check if pattern already starts with let/var
             guard let endIndex = formatter.index(of: .endOfScope(")"), after: i),
                   let prevIndex = formatter.index(before: i, where: {
-                      [.endOfScope("case"), .keyword("case"), .keyword("catch"),
-                       .delimiter(","), .endOfScope("}"), .operator("=", .infix)].contains($0)
+                      switch $0 {
+                      case .operator(".", _), .keyword("let"), .keyword("var"):
+                          return false
+                      case .endOfScope, .delimiter, .operator, .keyword:
+                          return true
+                      default:
+                          return false
+                      }
                   })
             else {
                 return
             }
             switch formatter.tokens[prevIndex] {
-            case .endOfScope("}"), .operator("=", .infix):
-                return
+            case .endOfScope("case"), .keyword("case"), .keyword("catch"):
+                break
             case .delimiter(","):
                 loop: for token in formatter.tokens[0 ..< prevIndex].reversed() {
                     switch token {
                     case .endOfScope("case"), .keyword("catch"):
                         break loop
-                    case .keyword("as"), .keyword("is"), .keyword("var"), .keyword("let"):
+                    case .keyword("var"), .keyword("let"):
                         break
                     case .keyword:
                         // Tuple assignment
@@ -3361,7 +3367,7 @@ public struct _FormatRules {
                     }
                 }
             default:
-                break
+                return
             }
             let startIndex = prevIndex + 1
             if let nextIndex = formatter.index(of: .nonSpaceOrCommentOrLinebreak, after: prevIndex),

diff --git a/Tests/RulesTests.swift b/Tests/RulesTests.swift
@@ -1244,6 +1244,28 @@ class RulesTests: XCTestCase {
         testFormatting(for: input, rule: FormatRules.hoistPatternLet, options: options)
     }
 
+    func testNoUnhoistSwitchCaseLetFollowedByWhere() {
+        let input = """
+        switch foo {
+        case let bar? where bar >= baz(quux):
+            break
+        }
+        """
+        let options = FormatOptions(hoistPatternLet: false)
+        testFormatting(for: input, rule: FormatRules.hoistPatternLet, options: options)
+    }
+
+    func testNoUnhoistSwitchCaseLetFollowedByAs() {
+        let input = """
+        switch foo {
+        case let bar as (String, String):
+            break
+        }
+        """
+        let options = FormatOptions(hoistPatternLet: false)
+        testFormatting(for: input, rule: FormatRules.hoistPatternLet, options: options)
+    }
+
     // MARK: - enumNamespaces
 
     func testEnumNamespacesClassAsProtocolRestriction() {

diff --git a/Tests/XCTestManifests.swift b/Tests/XCTestManifests.swift
@@ -1383,6 +1383,8 @@ extension RulesTests {
         ("testNoUnhoistIfArgIsNamespacedEnumCaseLiteralInParens", testNoUnhoistIfArgIsNamespacedEnumCaseLiteralInParens),
         ("testNoUnhoistIfCaseFollowedByLetTuple", testNoUnhoistIfCaseFollowedByLetTuple),
         ("testNoUnhoistIfLetTuple", testNoUnhoistIfLetTuple),
+        ("testNoUnhoistSwitchCaseLetFollowedByAs", testNoUnhoistSwitchCaseLetFollowedByAs),
+        ("testNoUnhoistSwitchCaseLetFollowedByWhere", testNoUnhoistSwitchCaseLetFollowedByWhere),
         ("testNoUnhoistTupleLet", testNoUnhoistTupleLet),
         ("testNoWrapAfterFirstArgumentInStringInterpolation", testNoWrapAfterFirstArgumentInStringInterpolation),
         ("testNoWrapAfterFirstArgumentInStringInterpolation2", testNoWrapAfterFirstArgumentInStringInterpolation2),