Fix closing chat panel

Author: intitni

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

@@ -52,7 +52,6 @@ extension ChatProvider {
         onClose = {
             Task {
                 await service.stopReceivingMessage()
-                PresentInWindowSuggestionPresenter().closeChatRoom(fileURL: fileURL)
                 onCloseChat()
             }
         }

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -71,29 +71,38 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
     func chatForFile(at url: URL) async -> ChatProvider? {
         let useGlobalChat = UserDefaults.shared.value(for: \.useGlobalChat)
         let buildChatProvider = { (service: ChatService) in
-            return ChatProvider(
+            ChatProvider(
                 service: service,
                 fileURL: url,
                 onCloseChat: { [weak self] in
-                    self?.globalChat = nil
+                    if UserDefaults.shared.value(for: \.useGlobalChat) {
+                        self?.globalChat = nil
+                    } else {
+                        self?.chats[url] = nil
+                    }
+                    let presenter = PresentInWindowSuggestionPresenter()
+                    presenter.closeChatRoom(fileURL: url)
                 },
                 onSwitchContext: { [weak self] in
+                    let useGlobalChat = UserDefaults.shared.value(for: \.useGlobalChat)
                     UserDefaults.shared.set(!useGlobalChat, for: \.useGlobalChat)
                     self?.createChatIfNeeded(for: url)
                     let presenter = PresentInWindowSuggestionPresenter()
                     presenter.presentChatRoom(fileURL: url)
                 }
             )
         }
-        
-        if useGlobalChat, let globalChat {
-            return buildChatProvider(globalChat)
-        }
 
-        if let service = chats[url] {
-            return buildChatProvider(service)
+        if useGlobalChat {
+            if let globalChat {
+                return buildChatProvider(globalChat)
+            }
+        } else {
+            if let service = chats[url] {
+                return buildChatProvider(service)
+            }
         }
-        
+
         return nil
     }
 }

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -97,7 +97,7 @@ public final class SuggestionWidgetController {
     private var colorScheme: ColorScheme = .light
 
     public var dataSource: SuggestionWidgetDataSource?
-   
+
     public nonisolated init() {
         #warning(
             "TODO: A test is initializing this class for unknown reasons, try a better way to avoid this."
@@ -117,6 +117,7 @@ public final class SuggestionWidgetController {
                             windowChangeObservationTask = nil
                             self.observeXcodeWindowChangeIfNeeded(app)
                         }
+                        await self.updateContentForActiveEditor()
                         self.updateWindowLocation()
                     } else {
                         if ActiveApplicationMonitor.activeApplication?.bundleIdentifier != Bundle
@@ -248,7 +249,7 @@ public extension SuggestionWidgetController {
         Task {
             if let chat = await dataSource?.chatForFile(at: fileURL) {
                 suggestionPanelViewModel.chat = chat
-                
+
                 Task { @MainActor in
                     // looks like we need a delay.
                     try await Task.sleep(nanoseconds: 150_000_000)
@@ -276,6 +277,7 @@ extension SuggestionWidgetController {
             let notifications = AXNotificationStream(
                 app: app,
                 notificationNames:
+                kAXApplicationActivatedNotification,
                 kAXMovedNotification,
                 kAXResizedNotification,
                 kAXMainWindowChangedNotification,
@@ -287,12 +289,11 @@ extension SuggestionWidgetController {
             for await notification in notifications {
                 guard let self else { return }
                 try Task.checkCancellation()
-                self.updateWindowLocation(animated: false)
-                panelWindow.orderFront(nil)
-                widgetWindow.orderFront(nil)
-                tabWindow.orderFront(nil)
 
-                if notification.name == kAXFocusedUIElementChangedNotification {
+                if [
+                    kAXFocusedUIElementChangedNotification,
+                    kAXApplicationActivatedNotification,
+                ].contains(notification.name) {
                     sourceEditorMonitorTask?.cancel()
                     sourceEditorMonitorTask = nil
                     observeEditorChangeIfNeeded(app)
@@ -309,6 +310,8 @@ extension SuggestionWidgetController {
                     currentFileURL = fileURL
                     await updateContentForActiveEditor(fileURL: fileURL)
                 }
+
+                self.updateWindowLocation(animated: false)
             }
         }
     }
@@ -428,17 +431,17 @@ extension SuggestionWidgetController {
             return
         }
 
-        if let suggestion = await dataSource?.suggestionForFile(at: fileURL) {
-            suggestionPanelViewModel.content = .suggestion(suggestion)
-        } else {
-            suggestionPanelViewModel.content = nil
-        }
-
         if let chat = await dataSource?.chatForFile(at: fileURL) {
             suggestionPanelViewModel.chat = chat
         } else {
             suggestionPanelViewModel.chat = nil
         }
+        
+        if let suggestion = await dataSource?.suggestionForFile(at: fileURL) {
+            suggestionPanelViewModel.content = .suggestion(suggestion)
+        } else {
+            suggestionPanelViewModel.content = nil
+        }
     }
 }