Allow making hotkey non-global

Author: intitni

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -133,6 +133,7 @@ struct ChatPanelMessages: View {
                                 .foregroundStyle(.secondary)
                                 .padding(4)
                         }
+                        .keyboardShortcut(.downArrow, modifiers: [.command])
                         .opacity(pinnedToBottom ? 0 : 1)
                         .buttonStyle(.plain)
                         .onChange(of: viewStore.state) { _ in

Core/Sources/HostApp/GeneralView.swift

@@ -225,6 +225,8 @@ struct GeneralSettingsView: View {
         var preferWidgetToStayInsideEditorWhenWidthGreaterThan
         @AppStorage(\.hideCircularWidget)
         var hideCircularWidget
+        @AppStorage(\.showHideWidgetShortcutGlobally)
+        var showHideWidgetShortcutGlobally
     }
 
     @StateObject var settings = Settings()
@@ -287,7 +289,11 @@ struct GeneralSettingsView: View {
                 Text("pt")
             }
 
-            KeyboardShortcuts.Recorder("Global Shortcut to Toggle Widgets", name: .showHideWidget)
+            KeyboardShortcuts.Recorder("Hotkey to Toggle Widgets", name: .showHideWidget)
+            
+            Toggle(isOn: $settings.showHideWidgetShortcutGlobally) {
+                Text("Enable the Hotkey Globally")
+            }
 
             Toggle(isOn: $settings.hideCircularWidget) {
                 Text("Hide circular widget")

Core/Sources/Service/Service.swift

@@ -1,8 +1,10 @@
+import Combine
 import Dependencies
 import Foundation
 import KeyboardShortcuts
 import Workspace
 import WorkspaceSuggestionService
+import XcodeInspector
 
 #if canImport(ProService)
 import ProService
@@ -27,6 +29,7 @@ public final class Service {
     public let guiController = GraphicalUserInterfaceController()
     public let realtimeSuggestionController = RealtimeSuggestionController()
     public let scheduledCleaner: ScheduledCleaner
+    let globalShortcutManager: GlobalShortcutManager
 
     #if canImport(ProService)
     let proService: ProService
@@ -38,6 +41,7 @@ public final class Service {
         scheduledCleaner = .init(workspacePool: workspacePool, guiController: guiController)
         workspacePool.registerPlugin { SuggestionServiceWorkspacePlugin(workspace: $0) }
         self.workspacePool = workspacePool
+        globalShortcutManager = .init(guiController: guiController)
 
         #if canImport(ProService)
         proService = withDependencies { dependencyValues in
@@ -48,8 +52,6 @@ public final class Service {
             ProService()
         }
         #endif
-        
-        KeyboardShortcuts.userDefaults = .shared
     }
 
     @MainActor
@@ -61,10 +63,51 @@ public final class Service {
         proService.start()
         #endif
         DependencyUpdater().update()
-        
+        globalShortcutManager.start()
+    }
+}
+
+@MainActor
+final class GlobalShortcutManager {
+    let guiController: GraphicalUserInterfaceController
+    private var cancellable = Set<AnyCancellable>()
+
+    nonisolated init(guiController: GraphicalUserInterfaceController) {
+        self.guiController = guiController
+    }
+
+    func start() {
+        KeyboardShortcuts.userDefaults = .shared
+        setupShortcutIfNeeded()
+
         KeyboardShortcuts.onKeyUp(for: .showHideWidget) { [guiController] in
             guiController.viewStore.send(.suggestionWidget(.circularWidget(.widgetClicked)))
         }
+        
+        XcodeInspector.shared.$activeApplication.sink { app in
+            if !UserDefaults.shared.value(for: \.showHideWidgetShortcutGlobally) {
+                let shouldBeEnabled = if let app, app.isXcode || app.isExtensionService {
+                    true
+                } else {
+                    false
+                }
+                if shouldBeEnabled {
+                    self.setupShortcutIfNeeded()
+                } else {
+                    self.removeShortcutIfNeeded()
+                }
+            } else {
+                self.setupShortcutIfNeeded()
+            }
+        }.store(in: &cancellable)
+    }
+
+    func setupShortcutIfNeeded() {
+        KeyboardShortcuts.enable(.showHideWidget)
+    }
+
+    func removeShortcutIfNeeded() {
+        KeyboardShortcuts.disable(.showHideWidget)
     }
 }
 

Tool/Sources/Preferences/Keys.swift

@@ -88,6 +88,11 @@ public struct UserDefaultPreferenceKeys {
         defaultValue: false,
         key: "HideCircularWidget"
     )
+    
+    public let showHideWidgetShortcutGlobally = PreferenceKey(
+        defaultValue: false,
+        key: "ShowHideWidgetShortcutGlobally"
+    )
 }
 
 // MARK: - OpenAI Account Settings

Tool/Sources/XcodeInspector/XcodeInspector.swift

@@ -24,13 +24,13 @@ public final class XcodeInspector: ObservableObject {
     @Published public internal(set) var focusedEditor: SourceEditor?
     @Published public internal(set) var focusedElement: AXUIElement?
     @Published public internal(set) var completionPanel: AXUIElement?
-    
+
     public var focusedEditorContent: EditorInformation? {
         guard let documentURL = XcodeInspector.shared.realtimeActiveDocumentURL,
               let workspaceURL = XcodeInspector.shared.realtimeActiveWorkspaceURL,
               let projectURL = XcodeInspector.shared.activeProjectRootURL
         else { return nil }
-        
+
         let editorContent = XcodeInspector.shared.focusedEditor?.content
         let language = languageIdentifierFromFileURL(documentURL)
         let relativePath = documentURL.path.replacingOccurrences(of: projectURL.path, with: "")
@@ -143,8 +143,8 @@ public final class XcodeInspector: ObservableObject {
 
     @MainActor
     func setActiveXcode(_ xcode: XcodeAppInstanceInspector) {
+        activeApplication = xcode
         xcode.refresh()
-
         for task in activeXcodeObservations { task.cancel() }
         for cancellable in activeXcodeCancellable { cancellable.cancel() }
         activeXcodeObservations.removeAll()
@@ -214,6 +214,8 @@ public class AppInstanceInspector: ObservableObject {
     public let appElement: AXUIElement
     public let runningApplication: NSRunningApplication
     public var isActive: Bool { runningApplication.isActive }
+    public var isXcode: Bool { runningApplication.isXcode }
+    public var isExtensionService: Bool { runningApplication.isCopilotForXcodeExtensionService }
 
     init(runningApplication: NSRunningApplication) {
         self.runningApplication = runningApplication