Make request cancellation simpler

Author: intitni

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -191,7 +191,7 @@ public class RealtimeSuggestionController {
             if event.type == .keyDown {
                 await cancelInFlightTasks()
             } else {
-                let task = Task {
+                Task {
                     #warning(
                         "TODO: Any method to avoid using AppleScript to check that completion panel is presented?"
                     )
@@ -200,7 +200,6 @@ public class RealtimeSuggestionController {
                         self.triggerPrefetchDebounced(force: true)
                     }
                 }
-                inflightRealtimeSuggestionsTasks.insert(task)
             }
         }
     }
@@ -247,18 +246,6 @@ public class RealtimeSuggestionController {
                     await workspace.cancelInFlightRealtimeSuggestionRequests()
                 }
             }
-            group.addTask {
-                await { @ServiceActor in
-                    inflightRealtimeSuggestionsTasks.forEach {
-                        if $0 == excluding { return }
-                        $0.cancel()
-                    }
-                    inflightRealtimeSuggestionsTasks.removeAll()
-                    if let excluded = excluding {
-                        inflightRealtimeSuggestionsTasks.insert(excluded)
-                    }
-                }()
-            }
         }
     }
 

Core/Sources/Service/Workspace.swift

@@ -91,7 +91,6 @@ final class Workspace {
         UserDefaults.shared.value(for: \.realtimeSuggestionToggle)
     }
 
-    var realtimeSuggestionRequests = Set<Task<Void, Error>>()
     let userDefaultsObserver = UserDefaultsObserver(
         object: UserDefaults.shared, forKeyPaths: [
             UserDefaultPreferenceKeys().suggestionFeatureEnabledProjectList.key,
@@ -245,12 +244,8 @@ extension Workspace {
     @discardableResult
     func generateSuggestions(
         forFileAt fileURL: URL,
-        editor: EditorContent,
-        shouldcancelInFlightRealtimeSuggestionRequests: Bool = true
+        editor: EditorContent
     ) async throws -> [CodeSuggestion] {
-        if shouldcancelInFlightRealtimeSuggestionRequests {
-            cancelInFlightRealtimeSuggestionRequests()
-        }
         refreshUpdateTime()
 
         let filespace = createFilespaceIfNeeded(fileURL: fileURL)
@@ -291,7 +286,6 @@ extension Workspace {
     }
 
     func selectNextSuggestion(forFileAt fileURL: URL) {
-        cancelInFlightRealtimeSuggestionRequests()
         refreshUpdateTime()
         guard let filespace = filespaces[fileURL],
               filespace.suggestions.count > 1
@@ -303,7 +297,6 @@ extension Workspace {
     }
 
     func selectPreviousSuggestion(forFileAt fileURL: URL) {
-        cancelInFlightRealtimeSuggestionRequests()
         refreshUpdateTime()
         guard let filespace = filespaces[fileURL],
               filespace.suggestions.count > 1
@@ -315,7 +308,6 @@ extension Workspace {
     }
 
     func rejectSuggestion(forFileAt fileURL: URL, editor: EditorContent?) {
-        cancelInFlightRealtimeSuggestionRequests()
         refreshUpdateTime()
 
         if let editor, !editor.uti.isEmpty {
@@ -331,7 +323,6 @@ extension Workspace {
     }
 
     func acceptSuggestion(forFileAt fileURL: URL, editor: EditorContent?) -> CodeSuggestion? {
-        cancelInFlightRealtimeSuggestionRequests()
         refreshUpdateTime()
         guard let filespace = filespaces[fileURL],
               !filespace.suggestions.isEmpty,
@@ -412,10 +403,8 @@ extension Workspace {
         return filespace.isExpired
     }
 
-    func cancelInFlightRealtimeSuggestionRequests() {
-        for task in realtimeSuggestionRequests {
-            task.cancel()
-        }
-        realtimeSuggestionRequests = []
+    func cancelInFlightRealtimeSuggestionRequests() async {
+        guard let suggestionService else { return }
+        await suggestionService.cancelRequest()
     }
 }

Core/Sources/Service/XPCService.swift

@@ -15,10 +15,6 @@ import XPCShared
 @ServiceActor
 var workspaces = [URL: Workspace]()
 
-#warning("TODO: Find a better place to store it!")
-@ServiceActor
-var inflightRealtimeSuggestionsTasks = Set<Task<Void, Never>>()
-
 public class XPCService: NSObject, XPCServiceProtocol {
     // MARK: - Service
 
@@ -127,15 +123,13 @@ public class XPCService: NSObject, XPCServiceProtocol {
         editorContent: Data,
         withReply reply: @escaping (Data?, Error?) -> Void
     ) {
-        let task = replyWithUpdatedContent(
+        replyWithUpdatedContent(
             editorContent: editorContent,
             isRealtimeSuggestionRelatedCommand: true,
             withReply: reply
         ) { handler, editor in
             try await handler.presentRealtimeSuggestions(editor: editor)
         }
-
-        Task { @ServiceActor in inflightRealtimeSuggestionsTasks.insert(task) }
     }
 
     public func prefetchRealtimeSuggestions(
@@ -145,15 +139,13 @@ public class XPCService: NSObject, XPCServiceProtocol {
         // We don't need to wait for this.
         reply()
 
-        let task = replyWithUpdatedContent(
+        replyWithUpdatedContent(
             editorContent: editorContent,
             isRealtimeSuggestionRelatedCommand: true,
             withReply: { _, _ in }
         ) { handler, editor in
             try await handler.generateRealtimeSuggestions(editor: editor)
         }
-
-        Task { @ServiceActor in inflightRealtimeSuggestionsTasks.insert(task) }
     }
 
     public func chatWithSelection(