Fix indent logic for closing braces

Author: nicklockwood

Sources/Rules.swift

@@ -1113,11 +1113,11 @@ public struct _FormatRules {
                         stringBodyIndentStack.removeLast()
                         stringBodyIndentStack.append(stringBodyIndentStack.last ?? "")
                     }
-                    // Check if line on which scope ends should be unindented
+                    // Don't reduce indent if line doesn't start with end of scope
+                    // or starts with a multiline string delimiter
                     let start = formatter.startOfLine(at: i)
-                    guard !formatter.isCommentedCode(at: start),
-                        // Don't reduce indent if end of scope is not first token in line
-                        formatter.index(of: .nonSpaceOrCommentOrLinebreak, after: start - 1) == i else {
+                    guard let firstToken = formatter.next(.nonSpaceOrComment, after: start - 1),
+                        firstToken.isEndOfScope, !firstToken.isMultilineStringDelimiter else {
                         break
                     }
                     // Reduce indent for closing scope of guard else back to normal

Tests/RulesTests.swift

@@ -1501,7 +1501,7 @@ class RulesTests: XCTestCase {
         Foo(bar:
             Bar(
                 baz: quux
-            ))
+        ))
         """
         testFormatting(for: input, rule: FormatRules.indent)
     }
@@ -1551,6 +1551,20 @@ class RulesTests: XCTestCase {
         testFormatting(for: input, output, rule: FormatRules.indent, exclude: ["redundantParens"])
     }
 
+    func testUnindentClosingParenAroundBraces() {
+        let input = """
+        foo(success: {
+            self.bar()
+                })
+        """
+        let output = """
+        foo(success: {
+            self.bar()
+        })
+        """
+        testFormatting(for: input, output, rule: FormatRules.indent)
+    }
+
     // indent switch/case
 
     func testSwitchCaseIndenting() {
@@ -1899,8 +1913,18 @@ class RulesTests: XCTestCase {
     }
 
     func testDoubleIndentWhenScopesSeparatedByWrap() {
-        let input = "(foo\nas Bar {\nbaz\n})"
-        let output = "(foo\n    as Bar {\n        baz\n})"
+        let input = """
+        (foo
+        as Bar {
+        baz
+        })
+        """
+        let output = """
+        (foo
+            as Bar {
+                baz
+        })
+        """
         testFormatting(for: input, output, rule: FormatRules.indent, exclude: ["redundantParens"])
     }
 
@@ -2527,12 +2551,21 @@ class RulesTests: XCTestCase {
     }
 
     func testIndentMultilineStringWrappedAfter() {
-        let input = "foo(baz:\n    \"\"\"\n    baz\n    \"\"\")"
+        let input = """
+        foo(baz:
+            \"""
+            baz
+            \""")
+        """
         testFormatting(for: input, rule: FormatRules.indent)
     }
 
     func testIndentMultilineStringInNestedCalls() {
-        let input = "foo(bar(\"\"\"\nbaz\n\"\"\"))"
+        let input = """
+        foo(bar(\"""
+        baz
+        \"""))
+        """
         testFormatting(for: input, rule: FormatRules.indent)
     }
 

Tests/XCTestManifests.swift

@@ -1721,6 +1721,7 @@ extension RulesTests {
         ("testUnhoistIfArgIsUnderscore", testUnhoistIfArgIsUnderscore),
         ("testUnhoistLabelledCaseLet", testUnhoistLabelledCaseLet),
         ("testUnhoistSingleCaseLet", testUnhoistSingleCaseLet),
+        ("testUnindentClosingParenAroundBraces", testUnindentClosingParenAroundBraces),
         ("testUnterminatedFragment", testUnterminatedFragment),
         ("testUnusedInoutClosureArgumentsNotMangled", testUnusedInoutClosureArgumentsNotMangled),
         ("testUnusedInoutFunctionArgumentIsNotMangled", testUnusedInoutFunctionArgumentIsNotMangled),