From b7e08dfb9e9837cabee98b8f6d7e4493aeb07c62 Mon Sep 17 00:00:00 2001 From: Danny Moesch Date: Thu, 7 Oct 2021 19:48:57 +0200 Subject: [PATCH] Enable SwiftLint rule 'static_operator' and fix all violations --- .swiftlint.yml | 2 +- passKit/Parser/AdditionField.swift | 7 +++++-- passKitTests/Testbase/TestBase.swift | 15 +++++++++------ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index a8fa31b..89a3481 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -170,7 +170,7 @@ only_rules: - sorted_first_last # - sorted_imports # Managed by SwiftFormat. - statement_position -# - static_operator + - static_operator - strict_fileprivate - strong_iboutlet - superfluous_disable_command diff --git a/passKit/Parser/AdditionField.swift b/passKit/Parser/AdditionField.swift index 31a6b49..91203b0 100644 --- a/passKit/Parser/AdditionField.swift +++ b/passKit/Parser/AdditionField.swift @@ -38,6 +38,9 @@ extension AdditionField { } infix operator =>: MultiplicationPrecedence -public func => (key: String, value: String) -> AdditionField { - AdditionField(title: key, content: value) + +public extension String { + static func => (key: String, value: String) -> AdditionField { + AdditionField(title: key, content: value) + } } diff --git a/passKitTests/Testbase/TestBase.swift b/passKitTests/Testbase/TestBase.swift index 2939bf3..5c816cb 100644 --- a/passKitTests/Testbase/TestBase.swift +++ b/passKitTests/Testbase/TestBase.swift @@ -50,11 +50,14 @@ func assertDefaults( } infix operator ∈: AdditionPrecedence -func ∈ (field: AdditionField, password: Password) -> Bool { // swiftlint:disable:this identifier_name - password.getFilteredAdditions().contains(field) -} - infix operator ∉: AdditionPrecedence -func ∉ (field: AdditionField, password: Password) -> Bool { // swiftlint:disable:this identifier_name - !(field ∈ password) + +extension AdditionField { + static func ∈ (field: AdditionField, password: Password) -> Bool { // swiftlint:disable:this identifier_name + password.getFilteredAdditions().contains(field) + } + + static func ∉ (field: AdditionField, password: Password) -> Bool { // swiftlint:disable:this identifier_name + !(field ∈ password) + } }