Fix issue where --beforemarks unexpectedly checked function bodies fo…

…r matching keywords
nicklockwood · Oct 24, 2024 · 86797ad · 86797ad
1 parent 5ab6cec
commit 86797ad
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 4 deletions.
diff --git a/Sources/DeclarationHelpers.swift b/Sources/DeclarationHelpers.swift
@@ -555,10 +555,6 @@ extension Declaration {
                 return .beforeMarks
             }
 
-            for token in declarationParser.tokens {
-                if beforeMarks.contains(token.string) { return .beforeMarks }
-            }
-
             let isStaticDeclaration = declarationParser.index(
                 of: .keyword("static"),
                 before: declarationTypeTokenIndex

diff --git a/Tests/Rules/OrganizeDeclarationsTests.swift b/Tests/Rules/OrganizeDeclarationsTests.swift
@@ -3482,4 +3482,50 @@ class OrganizeDeclarationsTests: XCTestCase {
             rule: .organizeDeclarations
         )
     }
+
+    func testIssue1907() {
+        let input = """
+        public final class Test: ObservableObject {
+            var someProperty: Int? = 0
+
+            // MARK: - Public -
+
+            public func somePublicFunction() {
+                print("Hello")
+                print("Hello")
+                print("Hello")
+                print("Hello")
+                print("Hello")
+            }
+
+            // MARK: - Internal -
+
+            func someInternalFunction() {
+                guard let someProperty else {
+                    return
+                }
+
+                print("Hello")
+                print("Hello")
+                print("Hello")
+                print("Hello")
+                print("Hello")
+            }
+
+            // MARK: - Private -
+
+            private func somePrivateFunction() {
+                print("Hello")
+                print("Hello")
+            }
+        }
+        """
+
+        let options = FormatOptions(
+            categoryMarkComment: "MARK: - %c -",
+            beforeMarks: ["class", "let", "var"]
+        )
+
+        testFormatting(for: input, rule: .organizeDeclarations, options: options)
+    }
 }