Fix that completion panel change is not observed if Xcode is launched after the extension

Author: intitni

Core/Sources/AXNotificationStream/AXNotificationStream.swift

@@ -72,13 +72,24 @@ public final class AXNotificationStream: AsyncSequence {
                 .commonModes
             )
         }
-        for name in notificationNames {
-            AXObserverAddNotification(observer, observingElement, name as CFString, &continuation)
+        
+        Task {
+            for name in notificationNames {
+                var error = AXError.cannotComplete
+                var retryCount = 0
+                while error == AXError.cannotComplete, retryCount < 5 {
+                    error = AXObserverAddNotification(observer, observingElement, name as CFString, &continuation)
+                    if error == .cannotComplete {
+                        try await Task.sleep(nanoseconds: 1_000_000_000)
+                    }
+                    retryCount += 1
+                }
+            }
+            CFRunLoopAddSource(
+                CFRunLoopGetMain(),
+                AXObserverGetRunLoopSource(observer),
+                .commonModes
+            )
         }
-        CFRunLoopAddSource(
-            CFRunLoopGetMain(),
-            AXObserverGetRunLoopSource(observer),
-            .commonModes
-        )
     }
 }

Core/Sources/XcodeInspector/XcodeInspector.swift

@@ -33,11 +33,11 @@ public final class XcodeInspector: ObservableObject {
             .first(where: \.isActive)
             .map(AppInstanceInspector.init(runningApplication:))
 
-        if let activeXcode {
-            setActiveXcode(activeXcode)
-        }
-
         Task { @MainActor in // Did activate app
+            if let activeXcode {
+                setActiveXcode(activeXcode)
+            }
+            
             let sequence = NSWorkspace.shared.notificationCenter
                 .notifications(named: NSWorkspace.didActivateApplicationNotification)
             for await notification in sequence {
@@ -87,7 +87,10 @@ public final class XcodeInspector: ObservableObject {
         }
     }
 
+    @MainActor
     func setActiveXcode(_ xcode: XcodeAppInstanceInspector) {
+        xcode.refresh()
+        
         for task in activeXcodeObservations { task.cancel() }
         for cancellable in activeXcodeCancellable { cancellable.cancel() }
         activeXcodeObservations.removeAll()
@@ -208,6 +211,51 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
         super.init(runningApplication: runningApplication)
 
         observeFocusedWindow()
+        observe()
+    }
+
+    func observeFocusedWindow() {
+        if let window = appElement.focusedWindow {
+            if window.identifier == "Xcode.WorkspaceWindow" {
+                let window = WorkspaceXcodeWindowInspector(
+                    app: runningApplication,
+                    uiElement: window
+                )
+                focusedWindow = window
+                focusedWindowObservations.forEach { $0.cancel() }
+                focusedWindowObservations.removeAll()
+
+                documentURL = window.documentURL
+                projectURL = window.projectURL
+
+                window.$documentURL
+                    .filter { $0 != .init(fileURLWithPath: "/") }
+                    .sink { [weak self] url in
+                        self?.documentURL = url
+                    }.store(in: &focusedWindowObservations)
+                window.$projectURL
+                    .filter { $0 != .init(fileURLWithPath: "/") }
+                    .sink { [weak self] url in
+                        self?.projectURL = url
+                    }.store(in: &focusedWindowObservations)
+            } else {
+                let window = XcodeWindowInspector(uiElement: window)
+                focusedWindow = window
+            }
+        } else {
+            focusedWindow = nil
+        }
+    }
+    
+    func refresh() {
+        (focusedWindow as? WorkspaceXcodeWindowInspector)?.refresh()
+        observe()
+    }
+    
+    func observe() {
+        longRunningTasks.forEach { $0.cancel() }
+        longRunningTasks = []
+        
         let focusedWindowChanged = Task {
             let notification = AXNotificationStream(
                 app: runningApplication,
@@ -243,14 +291,9 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
 
         longRunningTasks.insert(updateTabsTask)
 
-        completionPanel = appElement.firstChild { element in
-            element.identifier == "_XC_COMPLETION_TABLE_"
-        }?.parent
-
         let completionPanelTask = Task {
             let stream = AXNotificationStream(
                 app: runningApplication,
-                element: appElement,
                 notificationNames: kAXCreatedNotification, kAXUIElementDestroyedNotification
             )
 
@@ -279,39 +322,6 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
         longRunningTasks.insert(completionPanelTask)
     }
 
-    func observeFocusedWindow() {
-        if let window = appElement.focusedWindow {
-            if window.identifier == "Xcode.WorkspaceWindow" {
-                let window = WorkspaceXcodeWindowInspector(
-                    app: runningApplication,
-                    uiElement: window
-                )
-                focusedWindow = window
-                focusedWindowObservations.forEach { $0.cancel() }
-                focusedWindowObservations.removeAll()
-
-                documentURL = window.documentURL
-                projectURL = window.projectURL
-
-                window.$documentURL
-                    .filter { $0 != .init(fileURLWithPath: "/") }
-                    .sink { [weak self] url in
-                        self?.documentURL = url
-                    }.store(in: &focusedWindowObservations)
-                window.$projectURL
-                    .filter { $0 != .init(fileURLWithPath: "/") }
-                    .sink { [weak self] url in
-                        self?.projectURL = url
-                    }.store(in: &focusedWindowObservations)
-            } else {
-                let window = XcodeWindowInspector(uiElement: window)
-                focusedWindow = window
-            }
-        } else {
-            focusedWindow = nil
-        }
-    }
-
     static func fetchWorkspaceInfo(
         _ app: NSRunningApplication
     ) -> [WorkspaceIdentifier: WorkspaceInfo] {

Core/Sources/XcodeInspector/XcodeWindowInspector.swift

@@ -23,38 +23,51 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
         updateTabsTask?.cancel()
         focusedElementChangedTask?.cancel()
     }
+    
+    public func refresh() {
+        updateURLs()
+    }
 
     public init(app: NSRunningApplication, uiElement: AXUIElement) {
         self.app = app
         super.init(uiElement: uiElement)
 
         focusedElementChangedTask = Task { @MainActor in
-            let update = {
-                let documentURL = Self.extractDocumentURL(windowElement: uiElement)
-                if let documentURL {
-                    self.documentURL = documentURL
-                }
-                let projectURL = Self.extractProjectURL(
-                    windowElement: uiElement,
-                    fileURL: documentURL
-                )
-                if let projectURL {
-                    self.projectURL = projectURL
+            updateURLs()
+            
+            Task { @MainActor in
+                // prevent that documentURL may not be available yet
+                try await Task.sleep(nanoseconds: 500_000_000)
+                if documentURL == .init(fileURLWithPath: "/") {
+                    updateURLs()
                 }
             }
-
-            update()
+            
             let notifications = AXNotificationStream(
                 app: app,
                 notificationNames: kAXFocusedUIElementChangedNotification
             )
 
             for await _ in notifications {
                 try Task.checkCancellation()
-                update()
+                updateURLs()
             }
         }
     }
+    
+    func updateURLs() {
+        let documentURL = Self.extractDocumentURL(windowElement: uiElement)
+        if let documentURL {
+            self.documentURL = documentURL
+        }
+        let projectURL = Self.extractProjectURL(
+            windowElement: uiElement,
+            fileURL: documentURL
+        )
+        if let projectURL {
+            self.projectURL = projectURL
+        }
+    }
 
     static func extractDocumentURL(
         windowElement: AXUIElement