Unify implementation of app activation

intitni · intitni · commit ebce40141b02 · 2023-11-17T18:17:52.000+08:00
diff --git a/Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift b/Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift
@@ -1,4 +1,5 @@
 import ActiveApplicationMonitor
+import AppActivator
 import AppKit
 import ChatGPTChatTab
 import ChatTab
@@ -68,7 +69,8 @@ struct GUI: ReducerProtocol {
         #endif
     }
 
-    @Dependency(\.chatTabPool) var chatTabPool: ChatTabPool
+    @Dependency(\.chatTabPool) var chatTabPool
+    @Dependency(\.activateThisApp) var activateThisApp
 
     public enum Debounce: Hashable {
         case updateChatTabOrder
@@ -137,6 +139,11 @@ struct GUI: ReducerProtocol {
                                 .chatPanel(.presentChatPanel(forceDetach: forceDetach))
                             )
                         )
+                        await send(.suggestionWidget(.updateKeyWindow(.chatPanel)))
+
+                        if await !NSApplication.shared.isActive {
+                            activateThisApp()
+                        }
                     }
 
                 case .createChatGPTChatTabIfNeeded:
@@ -195,17 +202,8 @@ struct GUI: ReducerProtocol {
                     }
 
                 case .toggleWidgetsHotkeyPressed:
-                    let hasChat = state.chatTabGroup.selectedTabInfo != nil
-                    let hasPromptToCode = state.promptToCodeGroup.activePromptToCode != nil
-                    
                     return .run { send in
                         await send(.suggestionWidget(.circularWidget(.widgetClicked)))
-
-                        if hasPromptToCode {
-                            await send(.suggestionWidget(.updateKeyWindow(.sharedPanel)))
-                        } else if hasChat {
-                            await send(.suggestionWidget(.updateKeyWindow(.chatPanel)))
-                        }
                     }
 
                 case let .suggestionWidget(.chatPanel(.chatTab(id, .tabContentUpdated))):
@@ -278,12 +276,8 @@ public final class GraphicalUserInterfaceController {
                 Task {
                     let handler = PseudoCommandHandler()
                     await handler.acceptPromptToCode()
-                    if let app = ActiveApplicationMonitor.shared.previousApp,
-                       app.isXcode,
-                       !promptToCode.isContinuous
-                    {
-                        try await Task.sleep(nanoseconds: 200_000_000)
-                        app.activate()
+                    if !promptToCode.isContinuous {
+                        NSWorkspace.activatePreviousActiveXcode()
                     }
                 }
             }
diff --git a/Core/Sources/Service/GUI/WidgetDataSource.swift b/Core/Sources/Service/GUI/WidgetDataSource.swift
@@ -1,4 +1,6 @@
 import ActiveApplicationMonitor
+import AppActivator
+import AppKit
 import ChatService
 import ComposableArchitecture
 import Foundation
@@ -39,24 +41,14 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
                         Task {
                             let handler = PseudoCommandHandler()
                             await handler.rejectSuggestions()
-                            if let app = ActiveApplicationMonitor.shared.previousApp,
-                               app.isXcode
-                            {
-                                try await Task.sleep(nanoseconds: 200_000_000)
-                                app.activate()
-                            }
+                            NSWorkspace.activatePreviousActiveXcode()
                         }
                     },
                     onAcceptSuggestionTapped: {
                         Task {
                             let handler = PseudoCommandHandler()
                             await handler.acceptSuggestion()
-                            if let app = ActiveApplicationMonitor.shared.previousApp,
-                               app.isXcode
-                            {
-                                try await Task.sleep(nanoseconds: 200_000_000)
-                                app.activate()
-                            }
+                            NSWorkspace.activatePreviousActiveXcode()
                         }
                     }
                 )
diff --git a/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift
@@ -1,3 +1,4 @@
+import AppKit
 import ChatService
 import Environment
 import Foundation
@@ -409,7 +410,7 @@ extension WindowBaseCommandHandler {
         }() as (String, CursorRange)
 
         let viewStore = Service.shared.guiController.viewStore
-        
+
         let customCommandTemplateProcessor = CustomCommandTemplateProcessor()
         let newExtraSystemPrompt = extraSystemPrompt.map(customCommandTemplateProcessor.process)
         let newPrompt = prompt.map(customCommandTemplateProcessor.process)
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/ChatPanelFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/ChatPanelFeature.swift
@@ -77,8 +77,8 @@ public struct ChatPanelFeature: ReducerProtocol {
 
     @Dependency(\.suggestionWidgetControllerDependency) var suggestionWidgetControllerDependency
     @Dependency(\.xcodeInspector) var xcodeInspector
-    @Dependency(\.activatePreviouslyActiveXcode) var activatePreviouslyActiveXcode
-    @Dependency(\.activateExtensionService) var activateExtensionService
+    @Dependency(\.activatePreviousActiveXcode) var activatePreviouslyActiveXcode
+    @Dependency(\.activateThisApp) var activateExtensionService
     @Dependency(\.chatTabBuilderCollection) var chatTabBuilderCollection
 
     public var body: some ReducerProtocol<State, Action> {
@@ -88,7 +88,7 @@ public struct ChatPanelFeature: ReducerProtocol {
                 state.isPanelDisplayed = false
 
                 return .run { _ in
-                    await activatePreviouslyActiveXcode()
+                    activatePreviouslyActiveXcode()
                 }
 
             case .closeActiveTabClicked:
@@ -119,7 +119,7 @@ public struct ChatPanelFeature: ReducerProtocol {
                 }
                 state.isPanelDisplayed = true
                 return .run { send in
-                    await activateExtensionService()
+                    activateExtensionService()
                     await send(.focusActiveChatTab)
                 }
 
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift
@@ -37,6 +37,7 @@ public struct PanelFeature: ReducerProtocol {
 
     @Dependency(\.suggestionWidgetControllerDependency) var suggestionWidgetControllerDependency
     @Dependency(\.xcodeInspector) var xcodeInspector
+    @Dependency(\.activateThisApp) var activateThisApp
     var windows: WidgetWindows { suggestionWidgetControllerDependency.windows }
 
     public var body: some ReducerProtocol<State, Action> {
@@ -121,9 +122,7 @@ public struct PanelFeature: ReducerProtocol {
                     await send(.displayPanelContent)
 
                     if hasPromptToCode {
-                        // looks like we need a delay.
-                        try await Task.sleep(nanoseconds: 150_000_000)
-                        await NSApplication.shared.activate(ignoringOtherApps: true)
+                        activateThisApp()
                         await windows.sharedPanelWindow.makeKey()
                     }
                 }.animation(.easeInOut(duration: 0.2))
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodeGroup.swift b/Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodeGroup.swift
@@ -80,6 +80,7 @@ public struct PromptToCodeGroup: ReducerProtocol {
     }
 
     @Dependency(\.promptToCodeServiceFactory) var promptToCodeServiceFactory
+    @Dependency(\.activatePreviousActiveXcode) var activatePreviousActiveXcode
 
     public var body: some ReducerProtocol<State, Action> {
         Reduce { state, action in
@@ -143,7 +144,7 @@ public struct PromptToCodeGroup: ReducerProtocol {
                 case .cancelButtonTapped:
                     state.promptToCodes.remove(id: id)
                     return .run { _ in
-                        try await Environment.makeXcodeActive()
+                        activatePreviousActiveXcode()
                     }
                 default:
                     return .none
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift
@@ -1,4 +1,5 @@
 import ActiveApplicationMonitor
+import AppActivator
 import AsyncAlgorithms
 import AXNotificationStream
 import ComposableArchitecture
@@ -133,6 +134,8 @@ public struct WidgetFeature: ReducerProtocol {
     @Dependency(\.activeApplicationMonitor) var activeApplicationMonitor
     @Dependency(\.xcodeInspector) var xcodeInspector
     @Dependency(\.mainQueue) var mainQueue
+    @Dependency(\.activateThisApp) var activateThisApp
+    @Dependency(\.activatePreviousActiveApp) var activatePreviousActiveApp
 
     public enum DebounceKey: Hashable {
         case updateWindowOpacity
@@ -163,20 +166,26 @@ public struct WidgetFeature: ReducerProtocol {
                     state.panelState.suggestionPanelState.isPanelDisplayed = true
                     state.chatPanelState.isPanelDisplayed = true
                 }
+
                 let isDisplayingContent = state._circularWidgetState.isDisplayingContent
+                let hasChat = state.chatPanelState.chatTabGroup.selectedTabInfo != nil
+                let hasPromptToCode = state.panelState.sharedPanelState.content
+                    .promptToCodeGroup.activePromptToCode != nil
+
                 return .run { send in
                     if isDisplayingContent {
+                        if hasPromptToCode {
+                            await send(.updateKeyWindow(.sharedPanel))
+                        } else if hasChat {
+                            await send(.updateKeyWindow(.chatPanel))
+                        }
                         await send(.chatPanel(.focusActiveChatTab))
                     }
-                    
+
                     if isDisplayingContent, !(await NSApplication.shared.isActive) {
-                        try await Task.sleep(nanoseconds: 50_000_000)
-                        await NSApplication.shared.activate(ignoringOtherApps: true)
-                    } else if !isDisplayingContent,
-                              let app = xcodeInspector.previousActiveApplication
-                    {
-                        try await Task.sleep(nanoseconds: 20_000_000)
-                        app.runningApplication.activate()
+                        activateThisApp()
+                    } else if !isDisplayingContent {
+                        activatePreviousActiveApp()
                     }
                 }
 
@@ -599,7 +608,7 @@ public struct WidgetFeature: ReducerProtocol {
                 return .none
 
             case let .updateKeyWindow(window):
-                return .run { _ in
+                return .run { send in
                     switch window {
                     case .chatPanel:
                         await windows.chatPanelWindow.makeKeyAndOrderFront(nil)
diff --git a/Core/Sources/SuggestionWidget/ModuleDependency.swift b/Core/Sources/SuggestionWidget/ModuleDependency.swift
@@ -78,23 +78,6 @@ struct ChatTabBuilderCollectionKey: DependencyKey {
     static let liveValue: () -> [ChatTabBuilderCollection] = { [] }
 }
 
-struct ActivatePreviouslyActiveXcodeKey: DependencyKey {
-    static let liveValue = { @MainActor in
-        @Dependency(\.activeApplicationMonitor) var activeApplicationMonitor
-        if let app = activeApplicationMonitor.previousApp, app.isXcode {
-            try? await Task.sleep(nanoseconds: 200_000_000)
-            app.activate()
-        }
-    }
-}
-
-struct ActivateExtensionServiceKey: DependencyKey {
-    static let liveValue = { @MainActor in
-        try? await Task.sleep(nanoseconds: 150_000_000)
-        NSApplication.shared.activate(ignoringOtherApps: true)
-    }
-}
-
 public extension DependencyValues {
     var suggestionWidgetControllerDependency: SuggestionWidgetControllerDependency {
         get { self[SuggestionWidgetControllerDependencyKey.self] }
@@ -122,15 +105,5 @@ extension DependencyValues {
         get { self[ActiveApplicationMonitorKey.self] }
         set { self[ActiveApplicationMonitorKey.self] = newValue }
     }
-
-    var activatePreviouslyActiveXcode: () async -> Void {
-        get { self[ActivatePreviouslyActiveXcodeKey.self] }
-        set { self[ActivatePreviouslyActiveXcodeKey.self] = newValue }
-    }
-
-    var activateExtensionService: () async -> Void {
-        get { self[ActivateExtensionServiceKey.self] }
-        set { self[ActivateExtensionServiceKey.self] = newValue }
-    }
 }
 
diff --git a/Tool/Package.swift b/Tool/Package.swift
@@ -39,6 +39,7 @@ let package = Package(
                 "ActiveApplicationMonitor",
                 "AXExtension",
                 "AXNotificationStream",
+                "AppActivator",
             ]
         ),
     ],
@@ -111,6 +112,14 @@ let package = Package(
             ]
         ),
 
+        .target(
+            name: "AppActivator",
+            dependencies: [
+                "XcodeInspector",
+                .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
+            ]
+        ),
+
         .target(name: "ActiveApplicationMonitor"),
 
         .target(name: "USearchIndex", dependencies: [
diff --git a/Tool/Sources/AppActivator/AppActivator.swift b/Tool/Sources/AppActivator/AppActivator.swift
@@ -0,0 +1,61 @@
+import AppKit
+import Dependencies
+import XcodeInspector
+
+public extension NSWorkspace {
+    static func activateThisApp(delay: TimeInterval = 0.5) {
+        Task { @MainActor in
+            try await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
+            // NSApp.activate may fail.
+            NSRunningApplication(
+                processIdentifier: ProcessInfo.processInfo.processIdentifier
+            )?.activate()
+        }
+    }
+
+    static func activatePreviousActiveApp(delay: TimeInterval = 0.2) {
+        Task { @MainActor in
+            guard let app = XcodeInspector.shared.previousActiveApplication else { return }
+            try await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
+            app.runningApplication.activate()
+        }
+    }
+    
+    static func activatePreviousActiveXcode(delay: TimeInterval = 0.2) {
+        Task { @MainActor in
+            guard let app = XcodeInspector.shared.latestActiveXcode else { return }
+            try await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
+            app.runningApplication.activate()
+        }
+    }
+}
+
+struct ActivateThisAppDependencyKey: DependencyKey {
+    static var liveValue: () -> Void = { NSWorkspace.activateThisApp() }
+}
+
+struct ActivatePreviousActiveAppDependencyKey: DependencyKey {
+    static var liveValue: () -> Void = { NSWorkspace.activatePreviousActiveApp() }
+}
+
+struct ActivatePreviousActiveXcodeDependencyKey: DependencyKey {
+    static var liveValue: () -> Void = { NSWorkspace.activatePreviousActiveXcode() }
+}
+
+public extension DependencyValues {
+    var activateThisApp: () -> Void {
+        get { self[ActivateThisAppDependencyKey.self] }
+        set { self[ActivateThisAppDependencyKey.self] = newValue }
+    }
+
+    var activatePreviousActiveApp: () -> Void {
+        get { self[ActivatePreviousActiveAppDependencyKey.self] }
+        set { self[ActivatePreviousActiveAppDependencyKey.self] = newValue }
+    }
+    
+    var activatePreviousActiveXcode: () -> Void {
+        get { self[ActivatePreviousActiveXcodeDependencyKey.self] }
+        set { self[ActivatePreviousActiveXcodeDependencyKey.self] = newValue }
+    }
+}
+
diff --git a/Tool/Sources/Environment/Environment.swift b/Tool/Sources/Environment/Environment.swift
@@ -223,15 +223,6 @@ public enum Environment {
             }
         }
     }
-
-    public static var makeXcodeActive: () async throws -> Void = {
-        let appleScript = """
-        tell application "Xcode"
-            activate
-        end tell
-        """
-        try await runAppleScript(appleScript)
-    }
 }
 
 @discardableResult
diff --git a/Tool/Sources/FocusedCodeFinder/FocusedCodeFinder.swift b/Tool/Sources/FocusedCodeFinder/FocusedCodeFinder.swift
@@ -67,7 +67,7 @@ public struct UnknownLanguageFocusedCodeFinder: FocusedCodeFinder {
         guard !activeDocumentContext.lines.isEmpty else { return .empty }
 
         // when user is not selecting any code.
-        if containingRange.start == containingRange.end{
+        if containingRange.start == containingRange.end {
             // search up and down for up to `proposedSearchRange * 2 + 1` lines.
             let lines = activeDocumentContext.lines
             let proposedLineCount = proposedSearchRange * 2 + 1
@@ -80,6 +80,7 @@ public struct UnknownLanguageFocusedCodeFinder: FocusedCodeFinder {
                 lines.count - 1
             )
 
+            guard endLineIndex >= startLineIndex else { return .empty }
             let focusedLines = lines[startLineIndex...endLineIndex]
 
             let contextStartLine = max(startLineIndex - 5, 0)

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ public struct PromptToCodeGroup: ReducerProtocol {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Dependency(\.promptToCodeServiceFactory) var promptToCodeServiceFactory`
	`83`	`+ @Dependency(\.activatePreviousActiveXcode) var activatePreviousActiveXcode`
`83`	`84`
`84`	`85`	`public var body: some ReducerProtocol<State, Action> {`
`85`	`86`	`Reduce { state, action in`
`@@ -143,7 +144,7 @@ public struct PromptToCodeGroup: ReducerProtocol {`
`143`	`144`	`case .cancelButtonTapped:`
`144`	`145`	`state.promptToCodes.remove(id: id)`
`145`	`146`	`return .run { _ in`
`146`		`- try await Environment.makeXcodeActive()`
	`147`	`+ activatePreviousActiveXcode()`
`147`	`148`	`}`
`148`	`149`	`default:`
`149`	`150`	`return .none`