Test guard let

Author: nvelichkin

Sources/Rules.swift

@@ -1045,6 +1045,7 @@ public struct _FormatRules {
             case .startOfScope("{"):
                 guard canInsertSpaceAtStart else { return }
                 startToken = token
+                canInsertSpaceAtStart = false
 
                 guard let linebreakToken = formatter.token(at: i + 2),
                       !linebreakToken.isLinebreak
@@ -1075,66 +1076,6 @@ public struct _FormatRules {
                 break
             }
         }
-
-        formatter.forEachToken { i, token in
-            switch token {
-            case .keyword("class"),
-                 .keyword("struct"),
-                 .keyword("extension"):
-                guard let startOfScopeIndex = formatter.index(of: .startOfScope("{"), after: i),
-                      !(formatter.token(at: startOfScopeIndex + 2)?.isLinebreak ?? true)
-                else { return }
-
-                if let wrongToken = formatter.lastToken(before: startOfScopeIndex, where: {
-                    $0 == .keyword("func") || $0 == .keyword("protocol")
-                }),
-                    let wrongIndex = formatter.index(of: token, before: startOfScopeIndex)
-                {
-                    let startOfScopeLine = formatter.originalLine(at: startOfScopeIndex)
-                    let funcLine = formatter.originalLine(at: startOfScopeIndex)
-                    if startOfScopeLine == funcLine { return }
-                }
-
-                formatter.insertLinebreak(at: startOfScopeIndex + 1)
-
-            case .endOfScope("}"):
-                guard let currentScopeToken = formatter.currentScope(at: i),
-                      let startOfScopeIndex = formatter.index(of: currentScopeToken, before: i),
-                      let token = formatter.lastToken(before: startOfScopeIndex, where: {
-                          $0 == .keyword("class") ||
-                              $0 == .keyword("struct") ||
-                              $0 == .keyword("extension")
-                      }),
-                      let keywordIndex = formatter.index(of: token, before: startOfScopeIndex)
-                else { return }
-
-                let startOfScopeLine = formatter.originalLine(at: startOfScopeIndex)
-                let keywordLine = formatter.originalLine(at: keywordIndex)
-
-                if let wrongToken = formatter.lastToken(before: startOfScopeIndex, where: {
-                    $0 == .keyword("func") || $0 == .keyword("protocol")
-                }),
-                    let wrongIndex = formatter.index(of: token, before: startOfScopeIndex)
-                {
-                    let funcLine = formatter.originalLine(at: wrongIndex)
-                    if startOfScopeLine == funcLine { return }
-                }
-
-                guard startOfScopeLine == keywordLine else { return }
-                guard !(formatter.token(at: i)?.isLinebreak ?? true) else { return }
-                guard let prevEndScopeIndex = formatter.index(of: .endOfScope, before: i) else { return }
-
-                let isCloseBrace = formatter.token(at: prevEndScopeIndex) == .endOfScope("}")
-                let isCorrectEndOfScope = isCloseBrace || !(formatter.token(at: i - 3)?.isLinebreak ?? true)
-
-                guard isCorrectEndOfScope, prevEndScopeIndex == i - 2 else { return }
-
-                formatter.insertLinebreak(at: prevEndScopeIndex + 1)
-
-            default:
-                break
-            }
-        }
     }
 
     /// Adds a blank line around MARK: comments

Tests/RulesTests+BlanklineInScope.swift

@@ -12,6 +12,27 @@ 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 {

Tests/XCTestManifests.swift

@@ -115,6 +115,7 @@ extension BlanklineInScopeTests {
         ("testBlanklinesInsideProtocolExtension", testBlanklinesInsideProtocolExtension),
         ("testBlankLinesInStruct", testBlankLinesInStruct),
         ("testBlankLinesInStruct_noSpacing", testBlankLinesInStruct_noSpacing),
+        ("testGuardLet", testGuardLet),
     ]
 }