Update suggestion panel to display content according to editing file url

Author: intitni

Core/Sources/AXNotificationStream/AXNotificationStream.swift

@@ -6,7 +6,7 @@ public final class AXNotificationStream: AsyncSequence {
     public typealias Stream = AsyncStream<Element>
     public typealias Continuation = Stream.Continuation
     public typealias AsyncIterator = Stream.AsyncIterator
-    public typealias Element = (String, CFDictionary)
+    public typealias Element = (name: String, info: CFDictionary)
 
     private var continuation: Continuation
     private let stream: Stream

Core/Sources/Service/GUI/SuggestionPanelController.swift

@@ -30,23 +30,26 @@ final class SuggestionPanelController {
 
     private var windowChangeObservationTask: Task<Void, Error>?
     private var activeApplicationMonitorTask: Task<Void, Error>?
-    private var activeApplication: NSRunningApplication? {
-        ActiveApplicationMonitor.activeApplication
+    private var xcode: NSRunningApplication?
+    private var suggestionForFiles: [URL: Suggestion] = [:]
+    
+    enum Suggestion {
+        case code([String], startLineIndex: Int)
     }
 
     nonisolated init() {
         Task { @MainActor in
             activeApplicationMonitorTask = Task { [weak self] in
-                guard let self else { return }
                 var previousApp: NSRunningApplication?
                 for await app in ActiveApplicationMonitor.createStream() {
+                    guard let self else { return }
                     try Task.checkCancellation()
                     defer { previousApp = app }
-                    if let app, app.bundleIdentifier == "com.apple.dt.Xcode" {
+                    if let app = ActiveApplicationMonitor.activeXcode {
                         if app != previousApp {
                             windowChangeObservationTask?.cancel()
                             windowChangeObservationTask = nil
-                            self.observeXcodeWindowChangeIfNeeded()
+                            self.observeXcodeWindowChangeIfNeeded(app)
                         }
                     }
 
@@ -55,18 +58,44 @@ final class SuggestionPanelController {
             }
         }
     }
+    
+    func suggestCode(_ code: String, startLineIndex: Int, fileURL: URL) {
+        viewModel.suggestion = code.split(separator: "\n").map(String.init)
+        viewModel.startLineIndex = startLineIndex
+        suggestionForFiles[fileURL] = .code(viewModel.suggestion, startLineIndex: startLineIndex)
+    }
 
-    private func observeXcodeWindowChangeIfNeeded() {
+    private func observeXcodeWindowChangeIfNeeded(_ app: NSRunningApplication) {
+        xcode = app
         guard windowChangeObservationTask == nil else { return }
         windowChangeObservationTask = Task { [weak self] in
-            guard let self else { return }
             let notifications = AXNotificationStream(
-                app: activeApplication!,
-                notificationNames: kAXMovedNotification
+                app: app,
+                notificationNames:
+                kAXMovedNotification,
+                kAXResizedNotification,
+                kAXMainWindowChangedNotification,
+                kAXFocusedWindowChangedNotification,
+                kAXFocusedUIElementChangedNotification
             )
-            for await _ in notifications {
+            for await notification in notifications {
+                guard let self else { return }
                 try Task.checkCancellation()
                 self.updateWindowLocation()
+                
+                if notification.name == kAXFocusedUIElementChangedNotification {
+                    guard let fileURL = try? await Environment.fetchCurrentFileURL(),
+                          let suggestion = suggestionForFiles[fileURL]
+                    else {
+                        viewModel.suggestion = []
+                        continue
+                    }
+                    switch suggestion {
+                    case let .code(code, startLineIndex):
+                        viewModel.suggestion = code
+                        viewModel.startLineIndex = startLineIndex
+                    }
+                }
             }
         }
     }
@@ -76,10 +105,8 @@ final class SuggestionPanelController {
     /// - note: It's possible to get the scroll view's postion by getting position on the focus
     /// element.
     private func updateWindowLocation() {
-        if let activeXcode = activeApplication,
-           activeXcode.bundleIdentifier == "com.apple.dt.Xcode"
-        {
-            let application = AXUIElementCreateApplication(activeXcode.processIdentifier)
+        if let xcode {
+            let application = AXUIElementCreateApplication(xcode.processIdentifier)
             if let focusElement: AXUIElement = try? application
                 .copyValue(key: kAXFocusedUIElementAttribute),
                 let focusElementType: String = try? focusElement
@@ -126,11 +153,6 @@ final class SuggestionPanelViewModel: ObservableObject {
     }
 
     @Published var isPanelDisplayed = true
-
-    func suggestCode(_ code: String, startLineIndex: Int) {
-        suggestion = code.split(separator: "\n").map(String.init)
-        self.startLineIndex = startLineIndex
-    }
 }
 
 struct SuggestionPanelView: View {

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -40,7 +40,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         )
 
         if let suggestion = filespace.presentingSuggestion {
-            presentSuggestion(suggestion, lines: editor.lines)
+            presentSuggestion(suggestion, lines: editor.lines, fileURL: fileURL)
         } else {
             Task { @MainActor in
                 GraphicalUserInterfaceController.shared.suggestionPanelController.viewModel
@@ -67,7 +67,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         )
 
         if let suggestion = filespace.presentingSuggestion {
-            presentSuggestion(suggestion, lines: editor.lines)
+            presentSuggestion(suggestion, lines: editor.lines, fileURL: fileURL)
         } else {
             Task { @MainActor in
                 GraphicalUserInterfaceController.shared.suggestionPanelController.viewModel
@@ -94,7 +94,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         )
 
         if let suggestion = filespace.presentingSuggestion {
-            presentSuggestion(suggestion, lines: editor.lines)
+            presentSuggestion(suggestion, lines: editor.lines, fileURL: fileURL)
         } else {
             Task { @MainActor in
                 GraphicalUserInterfaceController.shared.suggestionPanelController.viewModel
@@ -140,11 +140,14 @@ struct WindowBaseCommandHandler: SuggestionCommandHanlder {
         try await presentSuggestions(editor: editor)
     }
 
-    func presentSuggestion(_ suggestion: CopilotCompletion, lines: [String]) {
+    func presentSuggestion(_ suggestion: CopilotCompletion, lines: [String], fileURL: URL) {
         Task { @MainActor in
-            let viewModel = GraphicalUserInterfaceController.shared.suggestionPanelController
-                .viewModel
-            viewModel.suggestCode(suggestion.text, startLineIndex: suggestion.position.line)
+            let controller = GraphicalUserInterfaceController.shared.suggestionPanelController
+            controller.suggestCode(
+                suggestion.text,
+                startLineIndex: suggestion.position.line,
+                fileURL: fileURL
+            )
         }
     }
 }