Unified keybinding observer logic which fixed a bug where find keybindings didnt work while find panel was in focus preventing it from being dismissed.

Author: austincondiff

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Views/ContentView.swift

@@ -21,7 +21,7 @@ struct ContentView: View {
     @State private var theme: EditorTheme = .light
     @State private var font: NSFont = NSFont.monospacedSystemFont(ofSize: 12, weight: .medium)
     @AppStorage("wrapLines") private var wrapLines: Bool = true
-    @State private var cursorPositions: [CursorPosition] = []
+    @State private var cursorPositions: [CursorPosition] = [.init(line: 1, column: 1)]
     @AppStorage("systemCursor") private var useSystemCursor: Bool = false
     @State private var isInLongParse = false
     @State private var treeSitterClient = TreeSitterClient()

Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift

@@ -129,21 +129,7 @@ extension TextViewController {
         eventMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event -> NSEvent? in
             guard self?.view.window?.firstResponder == self?.textView else { return event }
             let modifierFlags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
-
-            switch (modifierFlags, event.charactersIgnoringModifiers?.lowercased()) {
-            case (.command, "/"):
-                self?.handleCommandSlash()
-                return nil
-            case (.command, "f"):
-                _ = self?.textView.resignFirstResponder()
-                self?.searchController?.showFindPanel()
-                return nil
-            case ([], "\u{1b}"): // Escape key
-                self?.searchController?.findPanel.cancel()
-                return nil
-            default:
-                return event
-            }
+            return self?.handleCommand(event: event, modifierFlags: modifierFlags.rawValue)
         }
     }
 
@@ -160,6 +146,13 @@ extension TextViewController {
         case (commandKey, "]"):
             handleIndent()
             return nil
+        case (commandKey, "f"):
+            _ = self.textView.resignFirstResponder()
+            self.searchController?.showFindPanel()
+            return nil
+        case (0, "\u{1b}"): // Escape key
+            self.searchController?.findPanel.cancel()
+            return nil
         case (_, _):
             return event
         }