Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix false positives on rule first_where #2638

Merged
merged 6 commits into from
Feb 27, 2019
Merged

Fix false positives on rule first_where #2638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d67f61
[first_where] Add false positives from #1930 as non-triggering examples
Jeehut Feb 12, 2019
09fb947
[first_where] Prevent false positives by excluding some substructures
Jeehut Feb 12, 2019
11fa7f1
[first_where] Add CHANGELOG entry for fix
Jeehut Feb 12, 2019
5e1b491
[first_where] Fix code smells like suggested by @marcelofabri
Jeehut Feb 12, 2019
3c607f1
[first_where] Make triggering example valid Swift code
Jeehut Feb 14, 2019
d9113a7
[first_where] Fix CHANGELOG after solving merge conflicts
Jeehut Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,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
Expand Down
8 changes: 8 additions & 0 deletions Rules.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 15 additions & 7 deletions Source/SwiftLintFramework/Rules/Performance/FirstWhereRule.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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
}

Expand Down