Merge branch 'feature/tweak-about-widget-location-update' into develop

Author: intitni

Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift

@@ -96,12 +96,10 @@ public struct PanelFeature: ReducerProtocol {
 
             case .switchToAnotherEditorAndUpdateContent:
                 state.content.error = nil
+                state.content.suggestion = nil
                 return .run { send in
                     guard let fileURL = xcodeInspector.realtimeActiveDocumentURL else { return }
-                    if let suggestion = await fetchSuggestionProvider(fileURL: fileURL) {
-                        await send(.presentSuggestionProvider(suggestion, displayContent: false))
-                    }
-
+                    
                     await send(.sharedPanel(
                         .promptToCodeGroup(
                             .updateActivePromptToCode(documentURL: fileURL)

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -28,6 +28,8 @@ actor WidgetWindowsController: NSObject {
     var updateWindowLocationTask: Task<Void, Error>?
     var lastUpdateWindowLocationTime = Date(timeIntervalSince1970: 0)
 
+    var beatingCompletionPanelTask: Task<Void, Error>?
+
     deinit {
         userDefaultsObservers.presentationModeChangeObserver.onChange = {}
         observeToAppTask?.cancel()
@@ -61,15 +63,7 @@ actor WidgetWindowsController: NSObject {
 
         xcodeInspector.$completionPanel.sink { [weak self] newValue in
             Task { [weak self] in
-                if newValue == nil {
-                    // so that the buttons on the suggestion panel could be
-                    // clicked
-                    // before the completion panel updates the location of the
-                    // suggestion panel
-                    try await Task.sleep(nanoseconds: 400_000_000)
-                }
-                await self?.updateWindowLocation(animated: false, immediately: false)
-                await self?.updateWindowOpacity(immediately: false)
+                await self?.handleCompletionPanelChange(isDisplaying: newValue != nil)
             }
         }.store(in: &cancellable)
 
@@ -299,10 +293,10 @@ private extension WidgetWindowsController {
                     await send(.updateFocusingDocumentURL)
                 }
 
-                func updateWidgetsAndNotifyChangeOfEditor() async {
-                    await updateWindowLocation(animated: false, immediately: false)
-                    await updateWindowOpacity(immediately: false)
+                func updateWidgetsAndNotifyChangeOfEditor(immediately: Bool) async {
                     await send(.panel(.switchToAnotherEditorAndUpdateContent))
+                    await updateWindowLocation(animated: false, immediately: immediately)
+                    await updateWindowOpacity(immediately: immediately)
                 }
 
                 func updateWidgets() async {
@@ -313,9 +307,11 @@ private extension WidgetWindowsController {
                 switch notification.kind {
                 case .focusedWindowChanged, .focusedUIElementChanged:
                     await hideWidgetForTransitions()
-                    await updateWidgetsAndNotifyChangeOfEditor()
-                case .applicationActivated, .mainWindowChanged:
-                    await updateWidgetsAndNotifyChangeOfEditor()
+                    await updateWidgetsAndNotifyChangeOfEditor(immediately: true)
+                case .applicationActivated:
+                    await updateWidgetsAndNotifyChangeOfEditor(immediately: false)
+                case .mainWindowChanged:
+                    await updateWidgetsAndNotifyChangeOfEditor(immediately: false)
                 case .applicationDeactivated,
                      .moved,
                      .resized,
@@ -371,6 +367,22 @@ private extension WidgetWindowsController {
             }
         }
     }
+
+    func handleCompletionPanelChange(isDisplaying: Bool) {
+        beatingCompletionPanelTask?.cancel()
+        beatingCompletionPanelTask = Task {
+            if !isDisplaying {
+                // so that the buttons on the suggestion panel could be
+                // clicked
+                // before the completion panel updates the location of the
+                // suggestion panel
+                try await Task.sleep(nanoseconds: 400_000_000)
+            }
+
+            await updateWindowLocation(animated: false, immediately: false)
+            await updateWindowOpacity(immediately: false)
+        }
+    }
 }
 
 extension WidgetWindowsController {

Tool/Sources/AsyncPassthroughSubject/AsyncPassthroughSubject.swift

@@ -1,37 +1,19 @@
 import AppKit
 import Foundation
 
-/// It uses notification center to mimic the behavior of a passthrough subject.
 public actor AsyncPassthroughSubject<Element> {
-    let name: Notification.Name
     var tasks: [AsyncStream<Element>.Continuation] = []
 
     deinit {
         tasks.forEach { $0.finish() }
     }
 
-    public init() {
-        name = NSNotification.Name(
-            "AsyncPassthroughSubject-\(UUID().uuidString)-\(String(describing: Element.self))"
-        )
-    }
+    public init() {}
 
     public func notifications() -> AsyncStream<Element> {
-        AsyncStream { [weak self, name] continuation in
+        AsyncStream { [weak self] continuation in
             let task = Task { [weak self] in
                 await self?.storeContinuation(continuation)
-                let notifications = NotificationCenter.default.notifications(named: name)
-                    .compactMap {
-                        $0.object as? Element
-                    }
-                for await notification in notifications {
-                    try Task.checkCancellation()
-                    guard self != nil else {
-                        continuation.finish()
-                        return
-                    }
-                    continuation.yield(notification)
-                }
             }
 
             continuation.onTermination = { termination in
@@ -46,7 +28,10 @@ public actor AsyncPassthroughSubject<Element> {
     }
 
     func _send(_ element: Element) {
-        NotificationCenter.default.post(name: name, object: element)
+        let tasks = tasks
+        for task in tasks {
+            task.yield(element)
+        }
     }
 
     func storeContinuation(_ continuation: AsyncStream<Element>.Continuation) {