Minor adjustment

Author: intitni

Tool/Sources/XcodeInspector/Apps/XcodeAppInstanceInspector.swift

@@ -6,16 +6,6 @@ import Combine
 import Foundation
 
 public final class XcodeAppInstanceInspector: AppInstanceInspector {
-    @Published public fileprivate(set) var focusedWindow: XcodeWindowInspector?
-    @Published public fileprivate(set) var documentURL: URL? = nil
-    @Published public fileprivate(set) var workspaceURL: URL? = nil
-    @Published public fileprivate(set) var projectRootURL: URL? = nil
-    @Published public fileprivate(set) var workspaces = [WorkspaceIdentifier: Workspace]()
-    public var realtimeWorkspaces: [WorkspaceIdentifier: WorkspaceInfo] {
-        updateWorkspaceInfo()
-        return workspaces.mapValues(\.info)
-    }
-
     public struct AXNotification {
         public var kind: AXNotificationKind
         public var element: AXUIElement
@@ -71,9 +61,18 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
         }
     }
 
-    public let axNotifications = AsyncPassthroughSubject<AXNotification>()
-
+    @Published public fileprivate(set) var focusedWindow: XcodeWindowInspector?
+    @Published public fileprivate(set) var documentURL: URL? = nil
+    @Published public fileprivate(set) var workspaceURL: URL? = nil
+    @Published public fileprivate(set) var projectRootURL: URL? = nil
+    @Published public fileprivate(set) var workspaces = [WorkspaceIdentifier: Workspace]()
     @Published public private(set) var completionPanel: AXUIElement?
+    public var realtimeWorkspaces: [WorkspaceIdentifier: WorkspaceInfo] {
+        updateWorkspaceInfo()
+        return workspaces.mapValues(\.info)
+    }
+
+    public let axNotifications = AsyncPassthroughSubject<AXNotification>()
 
     public var realtimeDocumentURL: URL? {
         guard let window = appElement.focusedWindow,
@@ -144,7 +143,16 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
     }
 
     @MainActor
-    func observeFocusedWindow() {
+    func refresh() {
+        if let focusedWindow = focusedWindow as? WorkspaceXcodeWindowInspector {
+            focusedWindow.refresh()
+        } else {
+            observeFocusedWindow()
+        }
+    }
+
+    @MainActor
+    private func observeFocusedWindow() {
         if let window = appElement.focusedWindow {
             if window.identifier == "Xcode.WorkspaceWindow" {
                 let window = WorkspaceXcodeWindowInspector(
@@ -192,16 +200,7 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
     }
 
     @MainActor
-    func refresh() {
-        if let focusedWindow = focusedWindow as? WorkspaceXcodeWindowInspector {
-            focusedWindow.refresh()
-        } else {
-            observeFocusedWindow()
-        }
-    }
-
-    @MainActor
-    func observeAXNotifications() {
+    private func observeAXNotifications() {
         longRunningTasks.forEach { $0.cancel() }
         longRunningTasks = []
 

Tool/Sources/XcodeInspector/SourceEditor.swift

@@ -19,10 +19,10 @@ public class SourceEditor {
         case scrollPositionChanged
     }
 
-    public let axNotifications = AsyncPassthroughSubject<AXNotification>()
     let runningApplication: NSRunningApplication
     public let element: AXUIElement
     var observeAXNotificationsTask: Task<Void, Never>?
+    public let axNotifications = AsyncPassthroughSubject<AXNotification>()
 
     /// The content of the source editor.
     public var content: Content {
@@ -53,18 +53,14 @@ public class SourceEditor {
     public init(runningApplication: NSRunningApplication, element: AXUIElement) {
         self.runningApplication = runningApplication
         self.element = element
-
-        Task { @MainActor in
-            observeAXNotifications()
-        }
+        observeAXNotifications()
     }
 
-    @MainActor
-    func observeAXNotifications() {
+    private func observeAXNotifications() {
         observeAXNotificationsTask?.cancel()
         observeAXNotificationsTask = Task { @MainActor [weak self] in
             guard let self else { return }
-            await withTaskGroup(of: Void.self) { [weak self] group in
+            await withThrowingTaskGroup(of: Void.self) { [weak self] group in
                 guard let self else { return }
                 let editorNotifications = AXNotificationStream(
                     app: runningApplication,
@@ -76,6 +72,7 @@ public class SourceEditor {
 
                 group.addTask { [weak self] in
                     for await notification in editorNotifications {
+                        try Task.checkCancellation()
                         guard let self else { return }
                         if let kind: AXNotificationKind = {
                             switch notification.name {
@@ -101,6 +98,7 @@ public class SourceEditor {
 
                     group.addTask { [weak self] in
                         for await notification in scrollViewNotifications {
+                            try Task.checkCancellation()
                             guard let self else { return }
                             self.axNotifications.send(.init(
                                 kind: .scrollPositionChanged,
@@ -110,7 +108,7 @@ public class SourceEditor {
                     }
                 }
 
-                await group.waitForAll()
+                try? await group.waitForAll()
             }
         }
     }

Tool/Sources/XcodeInspector/XcodeInspector.swift

@@ -189,7 +189,7 @@ public final class XcodeInspector: ObservableObject {
     }
 
     @MainActor
-    func setActiveXcode(_ xcode: XcodeAppInstanceInspector) {
+    private func setActiveXcode(_ xcode: XcodeAppInstanceInspector) {
         previousActiveApplication = activeApplication
         activeApplication = xcode
         xcode.refresh()