Fix false positive in function_default_parameter_at_end

Fixes #2788
realm · Jul 5, 2019 · 94c6009 · 94c6009
1 parent bb1a012
commit 94c6009
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,11 @@
   [Marcelo Fabri](https://github.com/marcelofabri)
   [#2792](https://github.com/realm/SwiftLint/issues/2792)
 
+* Fix false positive in `function_default_parameter_at_end` rule when using
+  a closure parameter with default value.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+  [#2788](https://github.com/realm/SwiftLint/issues/2788)
+
 ## 0.33.0: Worldwide Dryers Conference
 
 #### Breaking

diff --git a/Rules.md b/Rules.md
@@ -8399,6 +8399,11 @@ func foo(a: Int, b: CGFloat = 0) {
 }
 ```
 
+```swift
+func foo(a: String, b: String? = nil,
+         c: String? = nil, d: @escaping AlertActionHandler = { _ in }) {}
+```
+
 </details>
 <details>
 <summary>Triggering Examples</summary>

diff --git a/Source/SwiftLintFramework/Rules/Idiomatic/FunctionDefaultParameterAtEndRule.swift b/Source/SwiftLintFramework/Rules/Idiomatic/FunctionDefaultParameterAtEndRule.swift
@@ -26,6 +26,10 @@ public struct FunctionDefaultParameterAtEndRule: ASTRule, ConfigurationProviderR
             func foo(a: Int, b: CGFloat = 0) {
               let block = { (error: Error?) in }
             }
+            """,
+            """
+            func foo(a: String, b: String? = nil,
+                     c: String? = nil, d: @escaping AlertActionHandler = { _ in }) {}
             """
         ],
         triggeringExamples: [
@@ -43,13 +47,22 @@ public struct FunctionDefaultParameterAtEndRule: ASTRule, ConfigurationProviderR
         }
 
         let isNotClosure = { !self.isClosureParameter(dictionary: $0) }
-        let params = dictionary.enclosedVarParameters.filter(isNotClosure).filter { param in
-            guard let paramOffset = param.offset else {
-                return false
+        let params = dictionary.substructure
+            .flatMap { subDict -> [[String: SourceKitRepresentable]] in
+                guard subDict.kind.flatMap(SwiftDeclarationKind.init) == .varParameter else {
+                    return []
+                }
+
+                return [subDict]
             }
+            .filter(isNotClosure)
+            .filter { param in
+                guard let paramOffset = param.offset else {
+                    return false
+                }
 
-            return paramOffset < bodyOffset
-        }
+                return paramOffset < bodyOffset
+            }
 
         guard !params.isEmpty else {
             return []