Activate Xcode when needed

Author: intitni

Core/Sources/Service/GUI/PromptToCodeProvider+Service.swift

@@ -1,3 +1,4 @@
+import ActiveApplicationMonitor
 import Combine
 import PromptToCodeService
 import SuggestionWidget
@@ -58,6 +59,9 @@ extension PromptToCodeProvider {
             Task { @ServiceActor in
                 let handler = PseudoCommandHandler()
                 await handler.acceptSuggestion()
+                if let app = ActiveApplicationMonitor.previousActiveApplication, app.isXcode {
+                    app.activate()
+                }
             }
         }
 
@@ -74,3 +78,4 @@ extension PromptToCodeProvider {
         }
     }
 }
+

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -173,12 +173,22 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
                         Task { @ServiceActor in
                             let handler = PseudoCommandHandler()
                             await handler.rejectSuggestions()
+                            if let app = ActiveApplicationMonitor.previousActiveApplication,
+                               app.isXcode
+                            {
+                                app.activate()
+                            }
                         }
                     },
                     onAcceptSuggestionTapped: {
                         Task { @ServiceActor in
                             let handler = PseudoCommandHandler()
                             await handler.acceptSuggestion()
+                            if let app = ActiveApplicationMonitor.previousActiveApplication,
+                               app.isXcode
+                            {
+                                app.activate()
+                            }
                         }
                     }
                 )

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -1,3 +1,4 @@
+import ActiveApplicationMonitor
 import AppKit
 import SwiftUI
 
@@ -9,7 +10,7 @@ final class ChatWindowViewModel: ObservableObject {
     @Published var colorScheme: ColorScheme
     @Published var isPanelDisplayed = false
     @Published var chatPanelInASeparateWindow = false
-    
+
     public init(chat: ChatProvider? = nil, colorScheme: ColorScheme = .dark) {
         self.chat = chat
         self.colorScheme = colorScheme
@@ -26,6 +27,11 @@ struct ChatWindowView: View {
                     .background {
                         Button(action: {
                             viewModel.isPanelDisplayed = false
+                            if let app = ActiveApplicationMonitor.previousActiveApplication,
+                               app.isXcode
+                            {
+                                app.activate()
+                            }
                         }) {
                             EmptyView()
                         }
@@ -38,3 +44,4 @@ struct ChatWindowView: View {
         .preferredColorScheme(viewModel.colorScheme)
     }
 }
+

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -1,3 +1,4 @@
+import ActiveApplicationMonitor
 import Environment
 import Preferences
 import SuggestionModel
@@ -26,15 +27,24 @@ struct WidgetView: View {
         Circle().fill(isHovering ? .white.opacity(0.8) : .white.opacity(0.3))
             .onTapGesture {
                 withAnimation(.easeInOut(duration: 0.2)) {
-                    let isDisplayed = {
+                    let wasDisplayed = {
                         if panelViewModel.isPanelDisplayed,
                            panelViewModel.content != nil { return true }
                         if chatWindowViewModel.isPanelDisplayed,
                            chatWindowViewModel.chat != nil { return true }
                         return false
                     }()
-                    panelViewModel.isPanelDisplayed = !isDisplayed
-                    chatWindowViewModel.isPanelDisplayed = !isDisplayed
+                    panelViewModel.isPanelDisplayed = !wasDisplayed
+                    chatWindowViewModel.isPanelDisplayed = !wasDisplayed
+                    let isDisplayed = !wasDisplayed
+
+                    if !isDisplayed {
+                        if let app = ActiveApplicationMonitor.previousActiveApplication,
+                           app.isXcode
+                        {
+                            app.activate()
+                        }
+                    }
                 }
             }
             .overlay {