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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor changes in Optional Collection extensions. 馃殌 #1110

Merged
merged 4 commits into from
Jun 19, 2023
Merged

Minor changes in Optional Collection extensions. 馃殌 #1110

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a726b09
Updated the `isNilOrEmpty` Bool computed var.
May 19, 2023
2f77308
Updated the `nonEmpty` Bool computed var.
May 20, 2023
7e23137
Removed the force unwrapping in `isNilOrEmpty` property.
May 21, 2023
c4b2431
Updated the `isNilOrEmpty` implementation
May 21, 2023
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
7 changes: 2 additions & 5 deletions Sources/SwifterSwift/SwiftStdlib/OptionalExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,12 @@ public extension Optional {
public extension Optional where Wrapped: Collection {
/// SwifterSwift: Check if optional is nil or empty collection.
var isNilOrEmpty: Bool {
guard let collection = self else { return true }
return collection.isEmpty
return self?.isEmpty ?? true
}

/// SwifterSwift: Returns the collection only if it is not nil and not empty.
var nonEmpty: Wrapped? {
guard let collection = self else { return nil }
guard !collection.isEmpty else { return nil }
return collection
return (self?.isEmpty ?? true) ? nil : self
}
}

Expand Down