Fix that paths were not updated

Author: intitni

Core/Sources/XcodeInspector/XcodeInspector.swift

@@ -91,6 +91,10 @@ public final class XcodeInspector: ObservableObject {
     }
 
     func observeXcode(_ xcode: XcodeAppInstanceInspector) {
+        activeDocumentURL = xcode.documentURL
+        activeProjectURL = xcode.projectURL
+        focusedWindow = xcode.focusedWindow
+
         xcode.$documentURL.filter { _ in xcode.isActive }.assign(to: &$activeDocumentURL)
         xcode.$projectURL.filter { _ in xcode.isActive }.assign(to: &$activeProjectURL)
         xcode.$focusedWindow.filter { _ in xcode.isActive }.assign(to: &$focusedWindow)
@@ -123,6 +127,8 @@ public final class XcodeInspector: ObservableObject {
                 }
             }
         }
+
+        activeXcodeObservations.insert(focusedElementChanged)
     }
 }
 
@@ -143,6 +149,7 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
     @Published var projectURL: URL = .init(fileURLWithPath: "/")
     @Published var tabs: Set<String> = []
     private var longRunningTasks = Set<Task<Void, Error>>()
+    private var focusedWindowObservations = Set<AnyCancellable>()
 
     deinit {
         for task in longRunningTasks { task.cancel() }
@@ -195,11 +202,31 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
 
     func observeFocusedWindow() {
         if let window = appElement.focusedWindow {
-            let window = XcodeWindowInspector(uiElement: window)
-            focusedWindow = window
-            if let workspaceWindow = window as? WorkspaceXcodeWindowInspector {
-                workspaceWindow.$documentURL.assign(to: &$documentURL)
-                workspaceWindow.$projectURL.assign(to: &$projectURL)
+            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

Core/Sources/XcodeInspector/XcodeWindowInspector.swift

@@ -24,18 +24,17 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
         focusedElementChangedTask?.cancel()
     }
 
-    init(app: NSRunningApplication, uiElement: AXUIElement) {
+    public init(app: NSRunningApplication, uiElement: AXUIElement) {
         self.app = app
         super.init(uiElement: uiElement)
 
         focusedElementChangedTask = Task { @MainActor in
             let update = {
-                let documentURL = Self.extractDocumentURL(app, windowElement: uiElement)
+                let documentURL = Self.extractDocumentURL(windowElement: uiElement)
                 if let documentURL {
                     self.documentURL = documentURL
                 }
                 let projectURL = Self.extractProjectURL(
-                    app,
                     windowElement: uiElement,
                     fileURL: documentURL
                 )
@@ -47,7 +46,6 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
             update()
             let notifications = AXNotificationStream(
                 app: app,
-                element: uiElement,
                 notificationNames: kAXFocusedUIElementChangedNotification
             )
 
@@ -59,12 +57,10 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
     }
 
     static func extractDocumentURL(
-        _ app: NSRunningApplication,
         windowElement: AXUIElement
     ) -> URL? {
-        // fetch file path of the frontmost window of Xcode through Accessability API.
-        let application = AXUIElementCreateApplication(app.processIdentifier)
-        var path = windowElement.document
+        // fetch file path of the frontmost window of Xcode through Accessibility API.
+        let path = windowElement.document
         if let path = path?.removingPercentEncoding {
             let url = URL(
                 fileURLWithPath: path
@@ -76,13 +72,10 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
     }
 
     static func extractProjectURL(
-        _ app: NSRunningApplication,
         windowElement: AXUIElement,
         fileURL: URL?
     ) -> URL? {
-        let application = AXUIElementCreateApplication(app.processIdentifier)
-        let focusedWindow = application.focusedWindow
-        for child in focusedWindow?.children ?? [] {
+        for child in windowElement.children {
             if child.description.starts(with: "/"), child.description.count > 1 {
                 let path = child.description
                 let trimmedNewLine = path.trimmingCharacters(in: .newlines)