Fix swiftlint warnings

Author: Maschina

Sources/KeyboardShortcuts/KeyboardShortcuts.swift

@@ -38,7 +38,7 @@ public enum KeyboardShortcuts {
 	private static var openMenuObserver: NSObjectProtocol?
 	private static var closeMenuObserver: NSObjectProtocol?
 	private static var userDefaultsObservers = [UserDefaultsObservation]()
-	
+
 	/**
 	The `UserDefaults` instance used to store and retrieve keyboard shortcut configurations.
 
@@ -78,7 +78,7 @@ public enum KeyboardShortcuts {
 	}
 
 	static var allNames: Set<Name> {
-		KeyboardShortcuts.userDefaults.dictionaryRepresentation()
+		Self.userDefaults.dictionaryRepresentation()
 			.compactMap { key, _ in
 				guard key.hasPrefix(userDefaultsPrefix) else {
 					return nil
@@ -345,7 +345,7 @@ public enum KeyboardShortcuts {
 	*/
 	public static func getShortcut(for name: Name) -> Shortcut? {
 		guard
-			let data = KeyboardShortcuts.userDefaults.string(forKey: userDefaultsKey(for: name))?.data(using: .utf8),
+			let data = Self.userDefaults.string(forKey: userDefaultsKey(for: name))?.data(using: .utf8),
 			let decoded = try? JSONDecoder().decode(Shortcut.self, from: data)
 		else {
 			return nil
@@ -462,17 +462,17 @@ public enum KeyboardShortcuts {
 
 	private static let userDefaultsPrefix = "KeyboardShortcuts_"
 
-	private static func userDefaultsKey(for shortcutName: Name) -> String { 
+	private static func userDefaultsKey(for shortcutName: Name) -> String {
 		"\(userDefaultsPrefix)\(shortcutName.rawValue)"
 	}
-	
+
 	/**
 	Start observing UserDefaults changes for a specific shortcut name.
 	Only starts observation if the shortcut is not already being observed.
 	*/
 	private static func startObservingShortcut(for name: Name) {
 		let key = userDefaultsKey(for: name)
-		
+
 		let observation = UserDefaultsObservation(
 			suite: userDefaults,
 			name: name,
@@ -484,12 +484,12 @@ public enum KeyboardShortcuts {
 				self.registerShortcutIfNeeded(for: name)
 			}
 		}
-		
+
 		observation.start()
-		
+
 		userDefaultsObservers.append(observation)
 	}
-	
+
 	static func userDefaultsDidChange(name: Name) {
 		// TODO: Use proper UserDefaults observation instead of this.
 		NotificationCenter.default.post(name: .shortcutByNameDidChange, object: nil, userInfo: ["name": name])
@@ -505,7 +505,7 @@ public enum KeyboardShortcuts {
 		}
 
 		register(shortcut)
-		KeyboardShortcuts.userDefaults.set(encoded, forKey: userDefaultsKey(for: name))
+		Self.userDefaults.set(encoded, forKey: userDefaultsKey(for: name))
 		userDefaultsDidChange(name: name)
 	}
 
@@ -514,7 +514,7 @@ public enum KeyboardShortcuts {
 			return
 		}
 
-		KeyboardShortcuts.userDefaults.set(false, forKey: userDefaultsKey(for: name))
+		Self.userDefaults.set(false, forKey: userDefaultsKey(for: name))
 		unregister(shortcut)
 		userDefaultsDidChange(name: name)
 	}
@@ -524,13 +524,13 @@ public enum KeyboardShortcuts {
 			return
 		}
 
-		KeyboardShortcuts.userDefaults.removeObject(forKey: userDefaultsKey(for: name))
+		Self.userDefaults.removeObject(forKey: userDefaultsKey(for: name))
 		unregister(shortcut)
 		userDefaultsDidChange(name: name)
 	}
 
 	static func userDefaultsContains(name: Name) -> Bool {
-		KeyboardShortcuts.userDefaults.object(forKey: userDefaultsKey(for: name)) != nil
+		Self.userDefaults.object(forKey: userDefaultsKey(for: name)) != nil
 	}
 }
 

Sources/KeyboardShortcuts/Utilities.swift

@@ -562,15 +562,17 @@ extension Character {
 
 final class UserDefaultsObservation: NSObject {
 	typealias Callback = (_ name: KeyboardShortcuts.Name, _ newKeyValue: String?) -> Void
-	
+
 	private let name: KeyboardShortcuts.Name
 	private let key: String
 	static var observationContext = 0
 	private weak var suite: UserDefaults?
 	private var isObserving = false
 	private let callback: Callback
 	private var lock = NSLock()
-	
+
+	private var token: NSKeyValueObservation? = nil
+
 	init(
 		suite: UserDefaults,
 		name: KeyboardShortcuts.Name,
@@ -582,50 +584,50 @@ final class UserDefaultsObservation: NSObject {
 		self.key = key
 		self.callback = callback
 	}
-	
+
 	deinit {
 		invalidate()
 	}
-	
+
 	func start() {
 		lock.lock()
-		
+
 		guard !isObserving else {
 			return
 		}
-		
+
 		suite?.addObserver(
 			self,
 			forKeyPath: key,
 			options: [.new],
 			context: &Self.observationContext
 		)
 		isObserving = true
-		
+
 		lock.unlock()
 	}
-	
+
 	func invalidate() {
 		lock.lock()
-		
+
 		guard isObserving else {
 			return
 		}
-		
+
 		suite?.removeObserver(
 			self,
 			forKeyPath: key
 		)
 		isObserving = false
 		suite = nil
-		
+
 		lock.unlock()
 	}
-	
+
 	override func observeValue(
 		forKeyPath keyPath: String?,
 		of object: Any?,
-		change: [NSKeyValueChangeKey : Any]?,
+		change: [NSKeyValueChangeKey: Any]?,
 		context: UnsafeMutableRawPointer?
 	) {
 		guard
@@ -639,23 +641,23 @@ final class UserDefaultsObservation: NSObject {
 			)
 			return
 		}
-		
+
 		guard let selfSuite = suite else {
 			invalidate()
 			return
 		}
-		
+
 		guard
 			selfSuite == (object as? UserDefaults),
 			let change
 		else {
 			return
 		}
-		
+
 		guard keyPath == key else {
 			return
 		}
-		
+
 		let encodedString = change[.newKey] as? String
 		callback(self.name, encodedString)
 	}