Update ShortcutManager to handle the shortcut handler throwing now

starkwm · Jan 26, 2025 · 8abec94 · 8abec94
1 parent 3fb4d48
commit 8abec94
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/Sources/skbdlib/ShortcutManager.swift b/Sources/skbdlib/ShortcutManager.swift
@@ -133,7 +133,11 @@ public enum ShortcutManager {
       return OSStatus(eventNotHandledErr)
     }
 
-    shortcut.handler()
+    do {
+      try shortcut.handler()
+    } catch {
+      return OSStatus(eventInternalErr)
+    }
 
     return noErr
   }

diff --git a/Tests/skbdlibTests/ShortcutManagerTests.swift b/Tests/skbdlibTests/ShortcutManagerTests.swift
@@ -239,4 +239,20 @@ class ShortcutManagerTests {
 
     #expect(status == OSStatus(eventNotHandledErr))
   }
+
+  @Test("ShortcutManager.handleCarbonEvent() (with broken shortcut handler)")
+  func handleCarbonEventWithBrokenShortcutHandler() async throws {
+    setenv("SHELL", "/bin/invalid", 1)
+
+    let handler = Shortcut.handler(for: "true")
+    let shortcut = Shortcut(123, 456, handler)
+
+    ShortcutManager.register(shortcut: shortcut)
+    let box = try #require(ShortcutManager.box(for: shortcut))
+
+    let event = createEventRef(signature: skbdEventHotKeySignature, id: box.eventHotKeyID)
+    let status = ShortcutManager.handleCarbonEvent(event)
+
+    #expect(status == OSStatus(eventInternalErr))
+  }
 }