Skip to content

Commit b2841bd

Browse files
lickellickel
authored
Linter updates (#45)
* Linter updates * Minor revert due to versioning hell
1 parent bb589c8 commit b2841bd

31 files changed

Lines changed: 421 additions & 397 deletions

‎.swiftformat‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@
77

88
--rules blankLineAfterImports
99
--rules braces
10+
--rules conditionalAssignment
1011
--rules duplicateImports
1112
--rules elseOnSameLine
1213
--rules genericExtensions
1314

15+
--rules hoistAwait
16+
--rules hoistTry
17+
1418
--rules indent
1519
--indent 4
1620
--indentcase false
@@ -20,11 +24,14 @@
2024
--rules leadingDelimiters
2125
--rules linebreakAtEndOfFile
2226

27+
--rules redundantClosure
2328
--rules redundantFileprivate
2429
--rules redundantGet
2530
--rules redundantInit
2631
--rules redundantOptionalBinding
2732
--rules redundantParens
33+
--rules redundantPattern
34+
--rules redundantReturn
2835
--rules redundantVoidReturnType
2936
--rules semicolons
3037

‎.swiftlint.yml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ disabled_rules:
55
- opening_brace
66
- unused_closure_parameter
77
- unused_optional_binding
8+
# Nice to haves
89
- cyclomatic_complexity
910
- function_body_length
1011
- line_length
11-
opt_in_rules:
12+
analyzer_rules:
1213
- capture_variable
14+
- unused_declaration
15+
- unused_import
16+
opt_in_rules:
17+
- balanced_xctest_lifecycle
1318
- closure_spacing
1419
- closure_end_indentation
1520
- collection_alignment
@@ -55,14 +60,15 @@ opt_in_rules:
5560
- redundant_nil_coalescing
5661
- redundant_objc_attribute
5762
- self_binding
63+
- single_test_class
64+
- shorthand_optional_binding
5865
- sorted_first_last
5966
- static_operator
6067
- strong_iboutlet
68+
- test_case_accessibility
6169
- toggle_bool
6270
- trailing_closure
6371
- untyped_error_in_catch
64-
- unused_import
65-
- unused_declaration
6672
- vertical_parameter_alignment_on_call
6773
- vertical_whitespace_between_cases
6874
- vertical_whitespace_opening_braces
@@ -94,7 +100,7 @@ large_tuple:
94100
warning: 3
95101
error: 4
96102
deployment_target:
97-
iOS_deployment_target: 13
98-
tvOS_deployment_target: 13
99-
watchOS_deployment_target: 6
100-
macOS_deployment_target: 10.15
103+
iOS_deployment_target: 14
104+
tvOS_deployment_target: 14
105+
watchOS_deployment_target: 7
106+
macOS_deployment_target: 11

‎Example/iOS-Example/Atomic.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ struct Atomic<Value> {
1919

2020
var wrappedValue: Value {
2121
get {
22-
return queue.sync { storage }
22+
queue.sync { storage }
2323
}
2424
set {
2525
queue.sync(flags: .barrier) { storage = newValue }
2626
}
2727
}
2828

2929
mutating func mutate(_ mutation: (inout Value) throws -> Void) rethrows {
30-
return try queue.sync(flags: .barrier) {
30+
try queue.sync(flags: .barrier) {
3131
try mutation(&storage)
3232
}
3333
}

‎Example/iOS-Example/Model+Persistence.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ private let decoder = JSONDecoder()
2121

2222
extension Model {
2323
func rawObjectEventUpdated() -> Notification.Name {
24-
return Notification.Name("\(NSStringFromClass(type(of: self))).rawObjectEventUpdated.\(id)")
24+
Notification.Name("\(NSStringFromClass(type(of: self))).rawObjectEventUpdated.\(id)")
2525
}
2626

2727
class func objectWasCreated() -> Notification.Name {
28-
return Notification.Name("\(NSStringFromClass(self)).objectWasCreated")
28+
Notification.Name("\(NSStringFromClass(self)).objectWasCreated")
2929
}
3030

3131
class func objectWasDeleted() -> Notification.Name {
32-
return Notification.Name("\(NSStringFromClass(self)).objectWasDeleted")
32+
Notification.Name("\(NSStringFromClass(self)).objectWasDeleted")
3333
}
3434

3535
class func dataWasCleared() -> Notification.Name {
36-
return Notification.Name("\(NSStringFromClass(self)).dataWasCleared")
36+
Notification.Name("\(NSStringFromClass(self)).dataWasCleared")
3737
}
3838
}
3939

@@ -125,7 +125,7 @@ extension Model {
125125

126126
extension NSObjectProtocol where Self: Model {
127127
static func fetchAll() -> [Self] {
128-
return storage.values.lazy.compactMap { value in
128+
storage.values.lazy.compactMap { value in
129129
value as? Data
130130
}.compactMap { data in
131131
try? decoder.decode(Model.RawData.self, from: data)
@@ -135,7 +135,7 @@ extension NSObjectProtocol where Self: Model {
135135
}
136136

137137
static func fetch(byID id: Model.ID) -> Self? {
138-
return storage[id].flatMap { value in
138+
storage[id].flatMap { value in
139139
value as? Data
140140
}.flatMap { data in
141141
try? decoder.decode(Model.RawData.self, from: data)

‎Example/iOS-Example/Model.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class Model: NSObject {
9090

9191
extension Model: Identifiable {
9292
var id: ID {
93-
return data.id
93+
data.id
9494
}
9595
}
9696

@@ -110,13 +110,13 @@ extension Model {
110110

111111
extension Model: FetchableObjectProtocol {
112112
func observeDataChanges(_ handler: @escaping @MainActor () -> Void) -> InvalidatableToken {
113-
return _data.observeChanges { change in
113+
_data.observeChanges { change in
114114
handler()
115115
}
116116
}
117117

118118
func observeIsDeletedChanges(_ handler: @escaping @MainActor () -> Void) -> InvalidatableToken {
119-
return self.observe(\.isDeleted, options: [.old, .new]) { @MainActor(unsafe) object, change in
119+
self.observe(\.isDeleted, options: [.old, .new]) { @MainActor(unsafe) object, change in
120120
guard let old = change.oldValue, let new = change.newValue, old != new else {
121121
return
122122
}
@@ -125,7 +125,7 @@ extension Model: FetchableObjectProtocol {
125125
}
126126

127127
static func entityID(from data: RawData) -> Model.ID? {
128-
return data.id
128+
data.id
129129
}
130130

131131
func listenForUpdates() {

‎Example/iOS-Example/Observable.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class Observable<Value> {
4848

4949
extension Observable where Value: Equatable {
5050
func observeChanges(handler: @escaping Handler) -> InvalidatableToken {
51-
return observe { change in
51+
observe { change in
5252
guard change.oldValue != change.newValue else {
5353
return
5454
}

‎Example/iOS-Example/ViewController.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ViewController: UITableViewController {
3030
}
3131

3232
class var reuseIdentifier: String {
33-
return NSStringFromClass(self)
33+
NSStringFromClass(self)
3434
}
3535
}
3636
}
@@ -69,11 +69,11 @@ extension ViewController {
6969

7070
extension ViewController {
7171
override func numberOfSections(in tableView: UITableView) -> Int {
72-
return controller.sections.count
72+
controller.sections.count
7373
}
7474

7575
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
76-
return controller.sections[section].numberOfObjects
76+
controller.sections[section].numberOfObjects
7777
}
7878

7979
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {

‎FetchRequests/Sources/Associations/AssociatedValueReference.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class AssociatedValueReference: NSObject {
8282
fileprivate var changeHandler: ChangeHandler?
8383

8484
var canObserveCreation: Bool {
85-
return creationObserver != nil
85+
creationObserver != nil
8686
}
8787

8888
init(

‎FetchRequests/Sources/Associations/FetchRequestAssociation.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public extension FetchRequestAssociation {
9393
},
9494
referenceGenerator: { _ in AssociatedValueReference() },
9595
observeKeyPath: { object, changeHandler in
96-
return object.observe(keyPath, options: [.old, .new]) { object, change in
96+
object.observe(keyPath, options: [.old, .new]) { object, change in
9797
guard change.oldValue != change.newValue else {
9898
return
9999
}
@@ -117,7 +117,7 @@ public extension FetchRequestAssociation {
117117
},
118118
referenceGenerator: { _ in AssociatedValueReference() },
119119
observeKeyPath: { object, changeHandler in
120-
return object.observe(keyPath, options: [.old, .new]) { object, change in
120+
object.observe(keyPath, options: [.old, .new]) { object, change in
121121
guard change.oldValue != change.newValue else {
122122
return
123123
}
@@ -184,7 +184,7 @@ public extension FetchRequestAssociation {
184184
},
185185
referenceGenerator: referenceGenerator,
186186
observeKeyPath: { object, changeHandler in
187-
return object.observe(keyPath, options: [.old, .new]) { object, change in
187+
object.observe(keyPath, options: [.old, .new]) { object, change in
188188
guard change.oldValue != change.newValue else {
189189
return
190190
}
@@ -247,7 +247,7 @@ public extension FetchRequestAssociation {
247247
},
248248
referenceGenerator: referenceGenerator,
249249
observeKeyPath: { object, changeHandler in
250-
return object.observe(keyPath, options: [.old, .new]) { object, change in
250+
object.observe(keyPath, options: [.old, .new]) { object, change in
251251
guard change.oldValue != change.newValue else {
252252
return
253253
}
@@ -387,7 +387,7 @@ public extension FetchRequestAssociation {
387387
request: rawRequest,
388388
referenceGenerator: referenceGenerator,
389389
observeKeyPath: { object, changeHandler in
390-
return object.observe(keyPath, options: [.old, .new]) { object, change in
390+
object.observe(keyPath, options: [.old, .new]) { object, change in
391391
guard change.oldValue != change.newValue else {
392392
return
393393
}
@@ -479,7 +479,7 @@ public extension FetchRequestAssociation {
479479
request: rawRequest,
480480
referenceGenerator: referenceGenerator,
481481
observeKeyPath: { object, changeHandler in
482-
return object.observe(keyPath, options: [.old, .new]) { object, change in
482+
object.observe(keyPath, options: [.old, .new]) { object, change in
483483
guard change.oldValue != change.newValue else {
484484
return
485485
}
@@ -607,7 +607,7 @@ public extension FetchRequestAssociation {
607607
request: rawRequest,
608608
referenceGenerator: referenceGenerator,
609609
observeKeyPath: { object, changeHandler in
610-
return object.observe(keyPath, options: [.old, .new]) { object, change in
610+
object.observe(keyPath, options: [.old, .new]) { object, change in
611611
guard change.oldValue != change.newValue else {
612612
return
613613
}
@@ -731,7 +731,7 @@ public extension FetchRequestAssociation {
731731
request: rawRequest,
732732
referenceGenerator: referenceGenerator,
733733
observeKeyPath: { object, changeHandler in
734-
return object.observe(keyPath, options: [.old, .new]) { object, change in
734+
object.observe(keyPath, options: [.old, .new]) { object, change in
735735
guard change.oldValue != change.newValue else {
736736
return
737737
}
@@ -898,7 +898,7 @@ public extension FetchRequestAssociation {
898898

899899
private extension Sequence {
900900
func associated<Key: Hashable>(by keySelector: (Element) throws -> Key) rethrows -> [Key: Element] {
901-
return try reduce(into: [:]) { memo, element in
901+
try reduce(into: [:]) { memo, element in
902902
let key = try keySelector(element)
903903
memo[key] = element
904904
}
@@ -907,6 +907,6 @@ private extension Sequence {
907907

908908
private extension Sequence where Element: FetchableObjectProtocol {
909909
func createLookupTable() -> [Element.ID: Element] {
910-
return self.associated(by: \.id)
910+
self.associated(by: \.id)
911911
}
912912
}

‎FetchRequests/Sources/Associations/FetchableEntityID.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ public protocol FetchableEntityID<FetchableEntity>: Hashable {
2222
)
2323
static func fetch(
2424
byIDs objectIDs: [Self],
25-
completion: @escaping @MainActor ([FetchableEntity]
26-
) -> Void)
25+
completion: @escaping @MainActor ([FetchableEntity]) -> Void
26+
)
2727
}
2828

2929
extension FetchableEntityID {
3030
static func fetch(byID objectID: Self) -> FetchableEntity? {
31-
return self.fetch(byIDs: [objectID]).first
31+
self.fetch(byIDs: [objectID]).first
3232
}
3333

3434
static func fetch(

0 commit comments

Comments
 (0)