From f4eb6ff49da1c7683fe57cf4e6a91b4502f98df1 Mon Sep 17 00:00:00 2001
From: Louis Pontoise <lwouis@gmail.com>
Date: Fri, 12 Nov 2021 20:52:03 +0900
Subject: [PATCH] refactor: fix non-impactful compiler warnings

---
 src/logic/Application.swift            | 2 +-
 src/logic/NSScreen.swift               | 2 +-
 src/logic/Windows.swift                | 2 +-
 src/logic/events/KeyboardEvents.swift  | 5 +++--
 src/ui/main-window/ThumbnailView.swift | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/logic/Application.swift b/src/logic/Application.swift
index a62f04a7..17d4404f 100644
--- a/src/logic/Application.swift
+++ b/src/logic/Application.swift
@@ -75,7 +75,7 @@ class Application: NSObject {
         if runningApplication.isFinishedLaunching && runningApplication.activationPolicy != .prohibited && axUiElement == nil {
             axUiElement = AXUIElementCreateApplication(pid)
             AXObserverCreate(pid, axObserverCallback, &axObserver)
-            debugPrint("Adding app", pid, runningApplication.bundleIdentifier ?? "nil")
+            debugPrint("Adding app", pid ?? "nil", runningApplication.bundleIdentifier ?? "nil")
             observeEvents()
         }
     }
diff --git a/src/logic/NSScreen.swift b/src/logic/NSScreen.swift
index a0c780ff..8780c7e4 100644
--- a/src/logic/NSScreen.swift
+++ b/src/logic/NSScreen.swift
@@ -32,7 +32,7 @@ extension NSScreen {
     //   * if NSScreen.screensHaveSeparateSpaces == false, and key window is on another screen than screens[0], it still returns screens[0]
     // we find the screen with the key window ourselves manually
     static func active() -> NSScreen? {
-        if let app = Applications.list.first { $0.pid == NSWorkspace.shared.frontmostApplication?.processIdentifier },
+        if let app = (Applications.list.first { $0.pid == NSWorkspace.shared.frontmostApplication?.processIdentifier }),
            let focusedWindow = app.focusedWindow {
             return NSScreen.screens.first { focusedWindow.isOnScreen($0) }
         }
diff --git a/src/logic/Windows.swift b/src/logic/Windows.swift
index 1d0bc0fd..f3c3ab6d 100644
--- a/src/logic/Windows.swift
+++ b/src/logic/Windows.swift
@@ -25,7 +25,7 @@ class Windows {
     }
 
     static func setInitialFocusedWindowIndex() {
-        if let app = Applications.list.first { $0.pid == NSWorkspace.shared.frontmostApplication?.processIdentifier },
+        if let app = (Applications.list.first { $0.pid == NSWorkspace.shared.frontmostApplication?.processIdentifier }),
            app.focusedWindow == nil,
            let lastFocusedWindowIndex = getLastFocusedWindowIndex() {
             updateFocusedWindowIndex(lastFocusedWindowIndex)
diff --git a/src/logic/events/KeyboardEvents.swift b/src/logic/events/KeyboardEvents.swift
index 92d38bc1..9fe38b79 100644
--- a/src/logic/events/KeyboardEvents.swift
+++ b/src/logic/events/KeyboardEvents.swift
@@ -67,8 +67,9 @@ class KeyboardEvents {
     }
 
     private static func addLocalMonitorForKeyDownAndKeyUp() {
-        localMonitor = NSEvent.addLocalMonitorForEvents(matching: [.keyDown, .keyUp]) { event in
-            return handleEvent(nil, nil, event.type == .keyDown ? UInt32(event.keyCode) : nil, cocoaToCarbonFlags(event.modifierFlags), event.type == .keyDown ? event.isARepeat : false) ? nil : event
+        localMonitor = NSEvent.addLocalMonitorForEvents(matching: [.keyDown, .keyUp]) { (event: NSEvent) in
+            let someShortcutTriggered = handleEvent(nil, nil, event.type == .keyDown ? UInt32(event.keyCode) : nil, cocoaToCarbonFlags(event.modifierFlags), event.type == .keyDown ? event.isARepeat : false)
+            return someShortcutTriggered ? nil : event
         }
     }
 
diff --git a/src/ui/main-window/ThumbnailView.swift b/src/ui/main-window/ThumbnailView.swift
index b9d64524..2fc9e4a7 100644
--- a/src/ui/main-window/ThumbnailView.swift
+++ b/src/ui/main-window/ThumbnailView.swift
@@ -178,6 +178,7 @@ class ThumbnailView: NSStackView {
         }
     }
 
+    @discardableResult
     func updateDockLabelIcon(_ dockLabel: Int?) -> Bool {
         assignIfDifferent(&dockLabelIcon.isHidden, dockLabel == nil || Preferences.hideAppBadges || Preferences.iconSize == 0)
         if !dockLabelIcon.isHidden, let dockLabel = dockLabel {