Fix hoisting try inside optional function

nicklockwood · Jun 2, 2023 · 5145179 · 5145179
1 parent e400870
commit 5145179
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Sources/FormattingHelpers.swift b/Sources/FormattingHelpers.swift
@@ -1071,6 +1071,10 @@ extension Formatter {
                  .startOfScope where tokens[i].isStringDelimiter,
                  .endOfScope where tokens[i].isStringDelimiter:
                 break
+            case .operator("?", .postfix), .operator("!", .postfix):
+                if prevToken != .startOfScope("(") {
+                    break loop
+                }
             case .operator(_, .postfix), .identifier, .number, .endOfScope:
                 if !prevToken.isOperator(ofType: .infix),
                    !prevToken.isOperator(ofType: .postfix)

diff --git a/Tests/RulesTests+Hoisting.swift b/Tests/RulesTests+Hoisting.swift
@@ -311,6 +311,12 @@ class HoistingTests: RulesTests {
         testFormatting(for: input, output, rule: FormatRules.hoistTry)
     }
 
+    func testHoistTryInsideOptionalFunction() {
+        let input = "foo?(try bar())"
+        let output = "try foo?(bar())"
+        testFormatting(for: input, output, rule: FormatRules.hoistTry)
+    }
+
     // MARK: - hoistAwait
 
     func testHoistAwait() {