Removed redundant trimming

This commit is contained in:
Federico Imberti 2025-12-28 11:18:01 +01:00
commit e3379eaf69

View file

@ -434,19 +434,17 @@ extension FocusModeType {
} }
static func resolve(identifier: String?, name: String?) -> FocusModeType { static func resolve(identifier: String?, name: String?) -> FocusModeType {
let trimmedName = name?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" if let name, !name.isEmpty {
if !trimmedName.isEmpty {
if let match = FocusModeType.allCases.first(where: { if let match = FocusModeType.allCases.first(where: {
guard !$0.displayName.isEmpty else { return false } guard !$0.displayName.isEmpty else { return false }
return $0.displayName.compare(trimmedName, options: [.caseInsensitive, .diacriticInsensitive]) == .orderedSame return $0.displayName.compare(name, options: [.caseInsensitive, .diacriticInsensitive]) == .orderedSame
}) { }) {
return match return match
} }
} }
let trimmedIdentifier = identifier?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" if let identifier, !identifier.isEmpty {
if !trimmedIdentifier.isEmpty { return FocusModeType(identifier: identifier)
return FocusModeType(identifier: trimmedIdentifier)
} }
return .doNotDisturb return .doNotDisturb