Fix hoisting try after string literal

nicklockwood · Mar 16, 2024 · d4ab4d7 · d4ab4d7
1 parent 1ef5563
commit d4ab4d7
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/Sources/FormattingHelpers.swift b/Sources/FormattingHelpers.swift
@@ -1153,8 +1153,7 @@ extension Formatter {
             case .operator(_, .prefix), .stringBody,
                  .endOfScope(")") where prevToken.isStringBody ||
                      (prevToken.isEndOfScope && prevToken.isStringDelimiter),
-                 .startOfScope where tokens[i].isStringDelimiter,
-                 .endOfScope where tokens[i].isStringDelimiter:
+                 .startOfScope where tokens[i].isStringDelimiter:
                 break
             case _ where tokens[i].isUnwrapOperator:
                 if last(.nonSpaceOrComment, before: i) == .keyword("try") {
@@ -1168,7 +1167,8 @@ extension Formatter {
                     fallthrough
                 }
             case .operator(_, .postfix), .identifier, .number,
-                 .endOfScope(">"), .endOfScope("]"), .endOfScope(")"):
+                 .endOfScope(">"), .endOfScope("]"), .endOfScope(")"),
+                 .endOfScope where tokens[i].isStringDelimiter:
                 switch prevToken {
                 case .operator(_, .infix), .operator(_, .postfix), .stringBody,
                      .startOfScope("<"), .startOfScope("["), .startOfScope("("),

diff --git a/Tests/RulesTests+Hoisting.swift b/Tests/RulesTests+Hoisting.swift
@@ -404,6 +404,42 @@ class HoistingTests: RulesTests {
         testFormatting(for: input, output, rule: FormatRules.hoistTry)
     }
 
+    func testHoistTryAfterString() {
+        let input = """
+        let json = "{}"
+
+        someFunction(try parse(json), "someKey")
+        """
+        let output = """
+        let json = "{}"
+
+        try someFunction(parse(json), "someKey")
+        """
+        testFormatting(for: input, output, rule: FormatRules.hoistTry)
+    }
+
+    func testHoistTryAfterMultilineString() {
+        let input = #"""
+        let json = """
+        {
+          "foo": "bar"
+        }
+        """
+
+        someFunction(try parse(json), "someKey")
+        """#
+        let output = #"""
+        let json = """
+        {
+          "foo": "bar"
+        }
+        """
+
+        try someFunction(parse(json), "someKey")
+        """#
+        testFormatting(for: input, output, rule: FormatRules.hoistTry)
+    }
+
     // MARK: - hoistAwait
 
     func testHoistAwait() {