Implement basic structure of suggestion cheatsheet

Author: intitni

Core/Package.swift

@@ -2,6 +2,57 @@
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
+import Foundation
+
+// MARK: - Pro
+
+extension [Target.Dependency] {
+    func pro(_ targetNames: [String]) -> [Target.Dependency] {
+        if isProIncluded {
+            // include the pro package
+            return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
+        }
+        return self
+    }
+}
+
+extension [Package.Dependency] {
+    var pro: [Package.Dependency] {
+        if isProIncluded {
+            // include the pro package
+            return self + [.package(path: "../Pro/Pro")]
+        }
+        return self
+    }
+}
+
+let isProIncluded: Bool = {
+    func isProIncluded(file: StaticString = #file) -> Bool {
+        let filePath = "\(file)"
+        let fileURL = URL(fileURLWithPath: filePath)
+        let rootURL = fileURL
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+        let confURL = rootURL.appendingPathComponent("PLUS")
+        if !FileManager.default.fileExists(atPath: confURL.path) {
+            return false
+        }
+        do {
+            let content = String(
+                data: try Data(contentsOf: confURL),
+                encoding: .utf8
+            )
+            print("")
+            return content?.hasPrefix("YES") ?? false
+        } catch {
+            return false
+        }
+    }
+
+    return isProIncluded()
+}()
+
+// MARK: - Package
 
 let package = Package(
     name: "Core",
@@ -322,52 +373,3 @@ let package = Package(
     ]
 )
 
-// MARK: - Pro
-
-extension [Target.Dependency] {
-    func pro(_ targetNames: [String]) -> [Target.Dependency] {
-        if isProIncluded {
-            // include the pro package
-            return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
-        }
-        return self
-    }
-}
-
-extension [Package.Dependency] {
-    var pro: [Package.Dependency] {
-        if isProIncluded {
-            // include the pro package
-            return self + [.package(path: "../Pro/Pro")]
-        }
-        return self
-    }
-}
-
-import Foundation
-
-let isProIncluded: Bool = {
-    func isProIncluded(file: StaticString = #file) -> Bool {
-        let filePath = "\(file)"
-        let fileURL = URL(fileURLWithPath: filePath)
-        let rootURL = fileURL
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-        let confURL = rootURL.appendingPathComponent("PLUS")
-        if !FileManager.default.fileExists(atPath: confURL.path) {
-            return false
-        }
-        do {
-            let content = String(
-                data: try Data(contentsOf: confURL),
-                encoding: .utf8
-            )
-            print("")
-            return content?.hasPrefix("YES") ?? false
-        } catch {
-            return false
-        }
-    }
-
-    return isProIncluded()
-}()

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -21,10 +21,23 @@ public actor RealtimeSuggestionController {
     private var sourceEditor: SourceEditor?
 
     init() {}
+    
+    deinit {
+        task?.cancel()
+        inflightPrefetchTask?.cancel()
+        windowChangeObservationTask?.cancel()
+        activeApplicationMonitorTask?.cancel()
+        editorObservationTask?.cancel()
+    }
 
     nonisolated
     func start() {
-        Task { [weak self] in
+        Task { await observeXcodeChange() }
+    }
+    
+    private func observeXcodeChange() {
+        task?.cancel()
+        task = Task { [weak self] in
             if ActiveApplicationMonitor.shared.activeXcode != nil {
                 await self?.handleXcodeChanged()
             }

Core/Sources/Service/Service.swift

@@ -3,9 +3,8 @@ import Foundation
 import Workspace
 import WorkspaceSuggestionService
 
-#if canImport(KeyBindingManager)
-import EnhancedWorkspace
-import KeyBindingManager
+#if canImport(ProService)
+import ProService
 #endif
 
 @globalActor public enum ServiceActor {
@@ -23,42 +22,36 @@ public final class Service {
     public let guiController = GraphicalUserInterfaceController()
     public let realtimeSuggestionController = RealtimeSuggestionController()
     public let scheduledCleaner: ScheduledCleaner
-    #if canImport(KeyBindingManager)
-    let keyBindingManager: KeyBindingManager
+
+    #if canImport(ProService)
+    let proService: ProService
     #endif
 
     private init() {
         @Dependency(\.workspacePool) var workspacePool
 
         scheduledCleaner = .init(workspacePool: workspacePool, guiController: guiController)
-        #if canImport(KeyBindingManager)
-        keyBindingManager = .init(
-            workspacePool: workspacePool,
-            acceptSuggestion: {
-                Task {
-                    await PseudoCommandHandler().acceptSuggestion()
-                }
-            }
-        )
-        #endif
-
         workspacePool.registerPlugin { SuggestionServiceWorkspacePlugin(workspace: $0) }
-        #if canImport(EnhancedWorkspace)
-        if !UserDefaults.shared.value(for: \.disableEnhancedWorkspace) {
-            workspacePool.registerPlugin { EnhancedWorkspacePlugin(workspace: $0) }
+        self.workspacePool = workspacePool
+
+        #if canImport(ProService)
+        proService = withDependencies { dependencyValues in
+            dependencyValues.proServiceAcceptSuggestion = {
+                Task { await PseudoCommandHandler().acceptSuggestion() }
+            }
+        } operation: {
+            ProService()
         }
         #endif
-
-        self.workspacePool = workspacePool
     }
 
     @MainActor
     public func start() {
         scheduledCleaner.start()
         realtimeSuggestionController.start()
         guiController.start()
-        #if canImport(KeyBindingManager)
-        keyBindingManager.start()
+        #if canImport(ProService)
+        proService.start()
         #endif
         DependencyUpdater().update()
     }