fix: refactor to remove NSEvent from InputState.swift

Author: ensan-hcl

Core/Sources/Core/InputUtils/InputState.swift

@@ -1,4 +1,4 @@
-import InputMethodKit
+import Foundation
 import KanaKanjiConverterModule
 
 public enum InputState: Sendable, Hashable {
@@ -10,29 +10,18 @@ public enum InputState: Sendable, Hashable {
     case replaceSuggestion
     case unicodeInput(String)
 
+    public enum ModifierFlag: Sendable, Equatable, Hashable {
+        case option
+        case control
+        case command
+        case shift
+    }
+
     public struct EventCore: Sendable, Equatable {
-        public init(modifierFlags: NSEvent.ModifierFlags) {
+        public init(modifierFlags: [ModifierFlag]) {
             self.modifierFlags = modifierFlags
         }
-        var modifierFlags: NSEvent.ModifierFlags
-    }
-
-    public func event(  // swiftlint:disable:this function_parameter_count
-        _ event: NSEvent!,
-        userAction: UserAction,
-        inputLanguage: InputLanguage,
-        liveConversionEnabled: Bool,
-        enableDebugWindow: Bool,
-        enableSuggestion: Bool
-    ) -> (ClientAction, ClientActionCallback) {
-        self.event(
-            eventCore: EventCore(modifierFlags: event.modifierFlags),
-            userAction: userAction,
-            inputLanguage: inputLanguage,
-            liveConversionEnabled: liveConversionEnabled,
-            enableDebugWindow: enableDebugWindow,
-            enableSuggestion: enableSuggestion
-        )
+        var modifierFlags: [ModifierFlag]
     }
 
     // この種のコードは複雑にしかならないので、lintを無効にする

azooKeyMac/InputController/InputState+NSEvent.swift

@@ -0,0 +1,35 @@
+import Cocoa
+import Core
+
+extension InputState {
+    public func event(  // swiftlint:disable:this function_parameter_count
+        _ event: NSEvent!,
+        userAction: UserAction,
+        inputLanguage: InputLanguage,
+        liveConversionEnabled: Bool,
+        enableDebugWindow: Bool,
+        enableSuggestion: Bool
+    ) -> (ClientAction, ClientActionCallback) {
+        var modifierFlags: [InputState.ModifierFlag] = []
+        if event.modifierFlags.contains(.shift) {
+            modifierFlags.append(.shift)
+        }
+        if event.modifierFlags.contains(.control) {
+            modifierFlags.append(.control)
+        }
+        if event.modifierFlags.contains(.command) {
+            modifierFlags.append(.command)
+        }
+        if event.modifierFlags.contains(.option) {
+            modifierFlags.append(.option)
+        }
+        return self.event(
+            eventCore: EventCore(modifierFlags: modifierFlags),
+            userAction: userAction,
+            inputLanguage: inputLanguage,
+            liveConversionEnabled: liveConversionEnabled,
+            enableDebugWindow: enableDebugWindow,
+            enableSuggestion: enableSuggestion
+        )
+    }
+}