Merge pull request #2638 from realm/cg-first_where-fix

Fix false positives on rule `first_where`
realm · Feb 27, 2019 · 7155b86 · 7155b86
2 parents 1b0ac66 + d9113a7
commit 7155b86
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -82,6 +82,10 @@
   [Cihat Gündüz](https://github.com/Dschee)
   [#2437](https://github.com/realm/SwiftLint/issues/2437)
 
+* Fix `first_where` for some calls on Realm collection types.  
+  [Cihat Gündüz](https://github.com/Dschee)
+  [#1930](https://github.com/realm/SwiftLint/issues/1930)
+
 ## 0.30.1: Localized Stain Remover
 
 #### Breaking

diff --git a/Rules.md b/Rules.md
@@ -7591,6 +7591,14 @@ match(pattern: pattern).filter { $0.first == .identifier }
 collection.filter("stringCol = '3'").first
 ```
 
+```swift
+realm?.objects(User.self).filter(NSPredicate(format: "email ==[c] %@", email)).first
+```
+
+```swift
+if let pause = timeTracker.pauses.filter("beginDate < %@", beginDate).first { print(pause) }
+```
+
 </details>
 <details>
 <summary>Triggering Examples</summary>

diff --git a/Source/SwiftLintFramework/Rules/Performance/FirstWhereRule.swift b/Source/SwiftLintFramework/Rules/Performance/FirstWhereRule.swift
@@ -16,7 +16,9 @@ public struct FirstWhereRule: CallPairRule, OptInRule, ConfigurationProviderRule
             "myList.first(where: { $0 % 2 == 0 })\n",
             "match(pattern: pattern).filter { $0.first == .identifier }\n",
             "(myList.filter { $0 == 1 }.suffix(2)).first\n",
-            "collection.filter(\"stringCol = '3'\").first"
+            "collection.filter(\"stringCol = '3'\").first",
+            "realm?.objects(User.self).filter(NSPredicate(format: \"email ==[c] %@\", email)).first",
+            "if let pause = timeTracker.pauses.filter(\"beginDate < %@\", beginDate).first { print(pause) }"
         ],
         triggeringExamples: [
             "↓myList.filter { $0 % 2 == 0 }.first\n",
@@ -30,12 +32,18 @@ public struct FirstWhereRule: CallPairRule, OptInRule, ConfigurationProviderRule
     )
 
     public func validate(file: File) -> [StyleViolation] {
-        return validate(file: file,
-                        pattern: "[\\}\\)]\\s*\\.first",
-                        patternSyntaxKinds: [.identifier],
-                        callNameSuffix: ".filter",
-                        severity: configuration.severity) { dictionary in
-            if !dictionary.substructure.isEmpty {
+        return validate(
+            file: file,
+            pattern: "[\\}\\)]\\s*\\.first",
+            patternSyntaxKinds: [.identifier],
+            callNameSuffix: ".filter",
+            severity: configuration.severity
+        ) { dictionary in
+            if
+                !dictionary.substructure.isEmpty &&
+                dictionary.substructure.last?.kind.flatMap(SwiftExpressionKind.init) != .argument &&
+                dictionary.substructure.last?.name != "NSPredicate"
+            {
                 return true // has a substructure, like a closure
             }