Tweak suggestion presentation

Author: intitni

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -105,9 +105,10 @@ public class RealtimeSuggestionController {
         let focusElementType = focusElement.description
         focusedUIElement = focusElement
 
+        let fileURL = XcodeInspector.shared.activeDocumentURL
+
         Task { // Notify suggestion service for open file.
             try await Task.sleep(nanoseconds: 500_000_000)
-            let fileURL = try await Environment.fetchCurrentFileURL()
             _ = try await Workspace.fetchOrCreateWorkspaceIfNeeded(fileURL: fileURL)
         }
 
@@ -118,6 +119,13 @@ public class RealtimeSuggestionController {
         editorObservationTask = nil
 
         editorObservationTask = Task { [weak self] in
+            if let sourceEditor = self?.sourceEditor {
+                await PseudoCommandHandler().invalidateRealtimeSuggestionsIfNeeded(
+                    fileURL: fileURL,
+                    sourceEditor: sourceEditor
+                )
+            }
+
             let notificationsFromEditor = AXNotificationStream(
                 app: activeXcode,
                 element: focusElement,
@@ -135,8 +143,10 @@ public class RealtimeSuggestionController {
                     await self.notifyEditingFileChange(editor: focusElement)
                 case kAXSelectedTextChangedNotification:
                     guard let sourceEditor else { continue }
-                    await PseudoCommandHandler()
-                        .invalidateRealtimeSuggestionsIfNeeded(sourceEditor: sourceEditor)
+                    await PseudoCommandHandler().invalidateRealtimeSuggestionsIfNeeded(
+                        fileURL: fileURL,
+                        sourceEditor: sourceEditor
+                    )
                 default:
                     continue
                 }

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -60,10 +60,9 @@ struct PseudoCommandHandler {
         _ = try? await handler.generateRealtimeSuggestions(editor: editor)
     }
 
-    func invalidateRealtimeSuggestionsIfNeeded(sourceEditor: SourceEditor) async {
-        guard let fileURL = try? await Environment.fetchCurrentFileURL(),
-              let (_, filespace) = try? await Workspace
-              .fetchOrCreateWorkspaceIfNeeded(fileURL: fileURL) else { return }
+    func invalidateRealtimeSuggestionsIfNeeded(fileURL: URL, sourceEditor: SourceEditor) async {
+        guard let (_, filespace) = try? await Workspace
+            .fetchOrCreateWorkspaceIfNeeded(fileURL: fileURL) else { return }
 
         if await !filespace.validateSuggestions(
             lines: sourceEditor.content.lines,

Core/Sources/Service/Workspace.swift

@@ -282,10 +282,6 @@ extension Workspace {
 
         let filespace = createFilespaceIfNeeded(fileURL: fileURL)
 
-        if filespaces[fileURL] == nil {
-            filespaces[fileURL] = filespace
-        }
-
         if !editor.uti.isEmpty {
             filespace.uti = editor.uti
             filespace.tabSize = editor.tabSize