refactor: add setup helper for window initialization

Author: ensan-hcl

azooKeyMac/InputController/azooKeyMacInputController.swift

@@ -34,6 +34,21 @@ class azooKeyMacInputController: IMKInputController, NSMenuItemValidation { // s
     // ダブルタップ検出用
     private var lastKey: (time: TimeInterval, code: UInt16) = (0, 0)
     private static let doubleTapInterval: TimeInterval = 0.5
+    private static let candidateWindowInitialSize = CGSize(width: 400, height: 1000)
+
+    private static func makeCandidateWindow(contentViewController: NSViewController, inputClient: IMKTextInput?) -> NSWindow {
+        let window = NSWindow(contentViewController: contentViewController)
+        window.styleMask = [.borderless]
+        window.level = .popUpMenu
+
+        var rect: NSRect = .zero
+        inputClient?.attributes(forCharacterIndex: 0, lineHeightRectangle: &rect)
+        rect.size = candidateWindowInitialSize
+        window.setFrame(rect, display: true)
+        window.setIsVisible(false)
+        window.orderOut(nil)
+        return window
+    }
 
     // MARK: - ダブルタップ検出
     private func checkAndUpdateDoubleTap(keyCode: UInt16) -> Bool {
@@ -65,48 +80,28 @@ class azooKeyMacInputController: IMKInputController, NSMenuItemValidation { // s
         self.liveConversionToggleMenuItem = NSMenuItem()
         self.transformSelectedTextMenuItem = NSMenuItem()
 
-        // Initialize the candidates window
-        self.candidatesViewController = CandidatesViewController()
-        self.candidatesWindow = NSWindow(contentViewController: self.candidatesViewController)
-        self.candidatesWindow.styleMask = [.borderless]
-        self.candidatesWindow.level = .popUpMenu
-
-        var rect: NSRect = .zero
-        if let client = inputClient as? IMKTextInput {
-            client.attributes(forCharacterIndex: 0, lineHeightRectangle: &rect)
-        }
-        rect.size = .init(width: 400, height: 1000)
-        self.candidatesWindow.setFrame(rect, display: true)
-        self.candidatesWindow.setIsVisible(false)
-        self.candidatesWindow.orderOut(nil)
-
-        // Initialize the prediction window
-        self.predictionViewController = PredictionCandidatesViewController()
-        self.predictionWindow = NSWindow(contentViewController: self.predictionViewController)
-        self.predictionWindow.styleMask = [.borderless]
-        self.predictionWindow.level = .popUpMenu
+        let textInputClient = inputClient as? IMKTextInput
 
-        if let client = inputClient as? IMKTextInput {
-            client.attributes(forCharacterIndex: 0, lineHeightRectangle: &rect)
-        }
-        rect.size = .init(width: 400, height: 1000)
-        self.predictionWindow.setFrame(rect, display: true)
-        self.predictionWindow.setIsVisible(false)
-        self.predictionWindow.orderOut(nil)
+        let candidatesViewController = CandidatesViewController()
+        let predictionViewController = PredictionCandidatesViewController()
+        let replaceSuggestionsViewController = ReplaceSuggestionsViewController()
 
-        // ReplaceSuggestionsViewControllerの初期化
-        self.replaceSuggestionsViewController = ReplaceSuggestionsViewController()
-        self.replaceSuggestionWindow = NSWindow(contentViewController: self.replaceSuggestionsViewController)
-        self.replaceSuggestionWindow.styleMask = [.borderless]
-        self.replaceSuggestionWindow.level = .popUpMenu
+        self.candidatesViewController = candidatesViewController
+        self.predictionViewController = predictionViewController
+        self.replaceSuggestionsViewController = replaceSuggestionsViewController
 
-        if let client = inputClient as? IMKTextInput {
-            client.attributes(forCharacterIndex: 0, lineHeightRectangle: &rect)
-        }
-        rect.size = .init(width: 400, height: 1000)
-        self.replaceSuggestionWindow.setFrame(rect, display: true)
-        self.replaceSuggestionWindow.setIsVisible(false)
-        self.replaceSuggestionWindow.orderOut(nil)
+        self.candidatesWindow = Self.makeCandidateWindow(
+            contentViewController: candidatesViewController,
+            inputClient: textInputClient
+        )
+        self.predictionWindow = Self.makeCandidateWindow(
+            contentViewController: predictionViewController,
+            inputClient: textInputClient
+        )
+        self.replaceSuggestionWindow = Self.makeCandidateWindow(
+            contentViewController: replaceSuggestionsViewController,
+            inputClient: textInputClient
+        )
 
         // PromptInputWindowの初期化
         self.promptInputWindow = PromptInputWindow()
@@ -792,25 +787,6 @@ extension azooKeyMacInputController: ReplaceSuggestionsViewControllerDelegate {
 
 // Suggest Candidate
 extension azooKeyMacInputController {
-    // MARK: - Window Setup
-    func setupReplaceSuggestionWindow() {
-        self.replaceSuggestionsViewController = ReplaceSuggestionsViewController()
-        self.replaceSuggestionWindow = NSWindow(contentViewController: self.replaceSuggestionsViewController)
-        self.replaceSuggestionWindow.styleMask = [.borderless]
-        self.replaceSuggestionWindow.level = .popUpMenu
-
-        var rect: NSRect = .zero
-        if let client = self.client() {
-            client.attributes(forCharacterIndex: 0, lineHeightRectangle: &rect)
-        }
-        rect.size = .init(width: 400, height: 1000)
-        self.replaceSuggestionWindow.setFrame(rect, display: true)
-        self.replaceSuggestionWindow.setIsVisible(false)
-        self.replaceSuggestionWindow.orderOut(nil)
-
-        self.replaceSuggestionsViewController.delegate = self
-    }
-
     // MARK: - Replace Suggestion Request Handling
     @MainActor func requestReplaceSuggestion() {
         self.segmentsManager.appendDebugMessage("requestReplaceSuggestion: 開始")