Update rule to insert blank line in scope

Author: nvelichkin

Sources/Formatter.swift

@@ -597,4 +597,32 @@ public extension Formatter {
         }
         return .linebreak(options.linebreak, lineNumber)
     }
+    
+    func addLinebreakAtStartOfScope(index i: Int, canInsertSpace: Bool) {
+        guard canInsertSpace else { return }
+
+        guard let linebreakToken = self.token(at: i + 2),
+              !linebreakToken.isLinebreak
+        else { return }
+
+        guard let endOfScopeToken = self.token(at: i + 1),
+              endOfScopeToken != .endOfScope("{")
+        else { return }
+
+        self.insertLinebreak(at: i + 1)
+    }
+    
+    func addLineBreakToEndOfScope(index i: Int, canInsertSpace: Bool) {
+        guard canInsertSpace,
+              let endOfScopeTokenIndex = self.endOfScope(at: i)
+        else { return }
+        
+        guard let linebreakToken = self.token(at: endOfScopeTokenIndex - 2),
+              !linebreakToken.isLinebreak
+        else { return }
+        
+        guard !self.onSameLine(i, endOfScopeTokenIndex) else { return }
+        
+        self.insertLinebreak(at: endOfScopeTokenIndex - 1)
+    }
 }

Sources/Rules.swift

@@ -1043,35 +1043,11 @@ public struct _FormatRules {
                 canInsertSpaceAtStart = false
 
             case .startOfScope("{"):
-                guard canInsertSpaceAtStart else { return }
-                startToken = token
+                formatter.addLinebreakAtStartOfScope(index: i, canInsertSpace: canInsertSpaceAtStart)
+                formatter.addLineBreakToEndOfScope(index: i, canInsertSpace: canInsertSpaceAtStart)
+                
                 canInsertSpaceAtStart = false
 
-                guard let linebreakToken = formatter.token(at: i + 2),
-                      !linebreakToken.isLinebreak
-                else { return }
-
-                guard let endOfScopeToken = formatter.token(at: i + 1),
-                      endOfScopeToken != .endOfScope("{")
-                else { return }
-
-                formatter.insertLinebreak(at: i + 1)
-
-            case .endOfScope("}"):
-                guard let startToken = startToken,
-                      token.isEndOfScope(startToken)
-                else { return }
-
-                guard let linebreakToken = formatter.token(at: i - 2),
-                      !linebreakToken.isLinebreak
-                else { return }
-
-                guard let startOfScopeToken = formatter.token(at: i - 1),
-                      startOfScopeToken != .startOfScope("{")
-                else { return }
-
-                formatter.insertLinebreak(at: i - 1)
-
             default:
                 break
             }

Tests/RulesTests+BlanklineInScope.swift

@@ -12,27 +12,6 @@ import XCTest
 class BlanklineInScopeTests: XCTestCase {
     // MARK: - Space in start/end of scope
 
-    func testGuardLet() {
-        let input = """
-            func setNavigationBarHidden(_ isHidden: Bool, animated: Bool) {
-                    guard let navigationController = navigationController else { return }
-
-                    navigationController.setNavigationBarHidden(isHidden, animated: animated)
-            }
-        """
-
-        let output = """
-            func setNavigationBarHidden(_ isHidden: Bool, animated: Bool) {
-                    guard let navigationController = navigationController else { return }
-
-                    navigationController.setNavigationBarHidden(isHidden, animated: animated)
-            }
-        """
-
-        let formattedInput = (try? format(input, rules: [FormatRules.insertBlankLinesAtScope])) ?? ""
-        XCTAssertEqual(output, formattedInput)
-    }
-
     func testBlankLineAtStartOfScope() {
         let input = """
         struct Foo {
@@ -355,6 +334,26 @@ class BlanklineInScopeTests: XCTestCase {
         XCTAssertEqual(output, formattedInput)
     }
 
+    func testGuardLet() {
+        let input = """
+            func setNavigationBarHidden(_ isHidden: Bool, animated: Bool) {
+                    guard let navigationController = navigationController else { return }
+
+                    navigationController.setNavigationBarHidden(isHidden, animated: animated)
+            }
+        """
+
+        let output = """
+            func setNavigationBarHidden(_ isHidden: Bool, animated: Bool) {
+                    guard let navigationController = navigationController else { return }
+
+                    navigationController.setNavigationBarHidden(isHidden, animated: animated)
+            }
+        """
+
+        let formattedInput = (try? format(input, rules: [FormatRules.insertBlankLinesAtScope])) ?? ""
+        XCTAssertEqual(output, formattedInput)
+    }
 //    func testBlanklineAfterCallSuper() {
 //        let input = """
 //        override func foo() {