Adjust Workspace

Author: intitni

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -87,11 +87,11 @@ final class WidgetDataSource {
 
 extension WidgetDataSource: SuggestionWidgetDataSource {
     func suggestionForFile(at url: URL) async -> SuggestionProvider? {
-        for workspace in await Service.shared.workspacePool.workspaces.values {
-            if let filespace = await workspace.filespaces[url],
-               let suggestion = await filespace.presentingSuggestion
+        for workspace in Service.shared.workspacePool.workspaces.values {
+            if let filespace = workspace.filespaces[url],
+               let suggestion = filespace.presentingSuggestion
             {
-                return await .init(
+                return .init(
                     code: suggestion.text,
                     language: filespace.language,
                     startLineIndex: suggestion.position.line,

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -12,14 +12,8 @@ import QuartzCore
 import Workspace
 import XcodeInspector
 
-@WorkspaceActor
 public class RealtimeSuggestionController {
-    var eventObserver: CGEventObserverType = CGEventObserver(eventsOfInterest: [
-        .keyUp,
-        .keyDown,
-        .rightMouseDown,
-        .leftMouseDown,
-    ])
+    let eventObserver: CGEventObserverType = CGEventObserver(eventsOfInterest: [.keyDown])
     private var task: Task<Void, Error>?
     private var inflightPrefetchTask: Task<Void, Error>?
     private var windowChangeObservationTask: Task<Void, Error>?
@@ -28,11 +22,13 @@ public class RealtimeSuggestionController {
     private var focusedUIElement: AXUIElement?
     private var sourceEditor: SourceEditor?
 
-    init() {
+    init() {}
+    
+    func start() {
         Task { [weak self] in
             if let app = ActiveApplicationMonitor.activeXcode {
                 self?.handleXcodeChanged(app)
-                self?.startHIDObservation(by: 1)
+                self?.startHIDObservation()
             }
             var previousApp = ActiveApplicationMonitor.activeXcode
             for await app in ActiveApplicationMonitor.createStream() {
@@ -45,17 +41,15 @@ public class RealtimeSuggestionController {
                 }
 
                 if ActiveApplicationMonitor.activeXcode != nil {
-                    startHIDObservation(by: 1)
+                    startHIDObservation()
                 } else {
-                    stopHIDObservation(by: 1)
+                    stopHIDObservation()
                 }
             }
         }
     }
 
-    private func startHIDObservation(by listener: AnyHashable) {
-        Logger.service.info("Add auto trigger listener: \(listener).")
-
+    private func startHIDObservation() {
         if task == nil {
             task = Task { [weak self, eventObserver] in
                 for await event in eventObserver.createStream() {
@@ -67,8 +61,7 @@ public class RealtimeSuggestionController {
         eventObserver.activateIfPossible()
     }
 
-    private func stopHIDObservation(by listener: AnyHashable) {
-        Logger.service.info("Remove auto trigger listener: \(listener).")
+    private func stopHIDObservation() {
         task?.cancel()
         task = nil
         eventObserver.deactivate()
@@ -241,7 +234,7 @@ public class RealtimeSuggestionController {
     func notifyEditingFileChange(editor: AXUIElement) async {
         guard let fileURL = try? await Environment.fetchCurrentFileURL(),
               let (workspace, filespace) = try? await Service.shared.workspacePool
-            .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
+              .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
         else { return }
         workspace.suggestionPlugin?.notifyUpdateFile(filespace: filespace, content: editor.value)
     }

Core/Sources/Service/ScheduledCleaner.swift

@@ -16,7 +16,9 @@ public final class ScheduledCleaner {
     ) {
         self.workspacePool = workspacePool
         self.guiController = guiController
+    }
 
+    func start() {
         // occasionally cleanup workspaces.
         Task { @ServiceActor in
             while !Task.isCancelled {
@@ -53,21 +55,21 @@ public final class ScheduledCleaner {
                 }
             }
         }
-        for (url, workspace) in await workspacePool.workspaces {
-            if await workspace.isExpired, workspaceInfos[.url(url)] == nil {
+        for (url, workspace) in workspacePool.workspaces {
+            if workspace.isExpired, workspaceInfos[.url(url)] == nil {
                 Logger.service.info("Remove idle workspace")
-                for url in await workspace.filespaces.keys {
+                for url in workspace.filespaces.keys {
                     await guiController.widgetDataSource.cleanup(for: url)
                 }
                 await workspace.cleanUp(availableTabs: [])
-                await workspacePool.removeWorkspace(url: url)
+                workspacePool.removeWorkspace(url: url)
             } else {
                 let tabs = (workspaceInfos[.url(url)]?.tabs ?? [])
                     .union(workspaceInfos[.unknown]?.tabs ?? [])
                 // cleanup chats for unused files
-                let filespaces = await workspace.filespaces
+                let filespaces = workspace.filespaces
                 for (url, _) in filespaces {
-                    if await workspace.isFilespaceExpired(
+                    if workspace.isFilespaceExpired(
                         fileURL: url,
                         availableTabs: tabs
                     ) {
@@ -83,7 +85,7 @@ public final class ScheduledCleaner {
 
     @ServiceActor
     public func closeAllChildProcesses() async {
-        for (_, workspace) in await workspacePool.workspaces {
+        for (_, workspace) in workspacePool.workspaces {
             await workspace.terminateSuggestionService()
         }
     }

Core/Sources/Service/WorkspaceExtension/Filespace+SuggestionService.swift

@@ -2,33 +2,17 @@ import Foundation
 import SuggestionModel
 import Workspace
 
-struct FilespaceCodeMetadata: Equatable {
-    var uti: String?
-    var tabSize: Int?
-    var indentSize: Int?
-    var usesTabsForIndentation: Bool?
-}
-
 struct FilespaceSuggestionSnapshot: Equatable {
     var linesHash: Int
     var cursorPosition: CursorPosition
 }
 
-struct FilespaceCodeMetadataKey: FilespacePropertyKey {
-    static func createDefaultValue() -> FilespaceCodeMetadata { .init() }
-}
-
 struct FilespaceSuggestionSnapshotKey: FilespacePropertyKey {
     static func createDefaultValue()
         -> FilespaceSuggestionSnapshot { .init(linesHash: -1, cursorPosition: .outOfScope) }
 }
 
 extension FilespacePropertyValues {
-    var codeMetadata: FilespaceCodeMetadata {
-        get { self[FilespaceCodeMetadataKey.self] }
-        set { self[FilespaceCodeMetadataKey.self] = newValue }
-    }
-
     var suggestionSourceSnapshot: FilespaceSuggestionSnapshot {
         get { self[FilespaceSuggestionSnapshotKey.self] }
         set { self[FilespaceSuggestionSnapshotKey.self] = newValue }
@@ -47,6 +31,7 @@ extension Filespace {
     ///    - lines: lines of the file
     ///    - cursorPosition: cursor position
     /// - Returns: `true` if the suggestion is still valid
+    @WorkspaceActor
     func validateSuggestions(lines: [String], cursorPosition: CursorPosition) -> Bool {
         guard let presentingSuggestion else { return false }
 

Core/Sources/Service/WorkspaceExtension/Workspace+Cleanup.swift

@@ -3,6 +3,7 @@ import Workspace
 import SuggestionService
 
 extension Workspace {
+    @WorkspaceActor
     func cleanUp(availableTabs: Set<String>) {
         for (fileURL, _) in filespaces {
             if isFilespaceExpired(fileURL: fileURL, availableTabs: availableTabs) {

Core/Sources/Service/WorkspaceExtension/Workspace+SuggestionService.swift

@@ -25,6 +25,7 @@ extension Workspace {
 }
 
 extension Workspace {
+    @WorkspaceActor
     @discardableResult
     func generateSuggestions(
         forFileAt fileURL: URL,
@@ -58,35 +59,31 @@ extension Workspace {
             usesTabsForIndentation: editor.usesTabsForIndentation,
             ignoreSpaceOnlySuggestions: true
         )
-
-        filespace.suggestions = completions
-        filespace.suggestionIndex = 0
+        
+        filespace.setSuggestions(completions)
 
         return completions
     }
 
+    @WorkspaceActor
     func selectNextSuggestion(forFileAt fileURL: URL) {
         refreshUpdateTime()
         guard let filespace = filespaces[fileURL],
               filespace.suggestions.count > 1
         else { return }
-        filespace.suggestionIndex += 1
-        if filespace.suggestionIndex >= filespace.suggestions.endIndex {
-            filespace.suggestionIndex = 0
-        }
+        filespace.nextSuggestion()
     }
 
+    @WorkspaceActor
     func selectPreviousSuggestion(forFileAt fileURL: URL) {
         refreshUpdateTime()
         guard let filespace = filespaces[fileURL],
               filespace.suggestions.count > 1
         else { return }
-        filespace.suggestionIndex -= 1
-        if filespace.suggestionIndex < 0 {
-            filespace.suggestionIndex = filespace.suggestions.endIndex - 1
-        }
+        filespace.previousSuggestion()
     }
 
+    @WorkspaceActor
     func rejectSuggestion(forFileAt fileURL: URL, editor: EditorContent?) {
         refreshUpdateTime()
 
@@ -102,6 +99,7 @@ extension Workspace {
         filespaces[fileURL]?.reset()
     }
 
+    @WorkspaceActor
     func acceptSuggestion(forFileAt fileURL: URL, editor: EditorContent?) -> CodeSuggestion? {
         refreshUpdateTime()
         guard let filespace = filespaces[fileURL],

Tool/Sources/Workspace/Filespace.swift

@@ -7,7 +7,6 @@ public protocol FilespacePropertyKey {
     static func createDefaultValue() -> Value
 }
 
-@WorkspaceActor
 public final class FilespacePropertyValues {
     var storage: [ObjectIdentifier: Any] = [:]
 
@@ -26,16 +25,35 @@ public final class FilespacePropertyValues {
     }
 }
 
-@WorkspaceActor
+public struct FilespaceCodeMetadata: Equatable {
+    public var uti: String?
+    public var tabSize: Int?
+    public var indentSize: Int?
+    public var usesTabsForIndentation: Bool?
+
+    init(
+        uti: String? = nil,
+        tabSize: Int? = nil,
+        indentSize: Int? = nil,
+        usesTabsForIndentation: Bool? = nil
+    ) {
+        self.uti = uti
+        self.tabSize = tabSize
+        self.indentSize = indentSize
+        self.usesTabsForIndentation = usesTabsForIndentation
+    }
+}
+
 @dynamicMemberLookup
 public final class Filespace {
     public let fileURL: URL
     public private(set) lazy var language: String = languageIdentifierFromFileURL(fileURL).rawValue
-    public var suggestions: [CodeSuggestion] = [] {
+    public var codeMetadata: FilespaceCodeMetadata = .init()
+    public private(set) var suggestions: [CodeSuggestion] = [] {
         didSet { refreshUpdateTime() }
     }
 
-    public var suggestionIndex: Int = 0
+    public private(set) var suggestionIndex: Int = 0
 
     public var presentingSuggestion: CodeSuggestion? {
         guard suggestions.endIndex > suggestionIndex, suggestionIndex >= 0 else { return nil }
@@ -45,7 +63,7 @@ public final class Filespace {
     public var isExpired: Bool {
         Environment.now().timeIntervalSince(lastSuggestionUpdateTime) > 60 * 3
     }
-    
+
     private(set) var lastSuggestionUpdateTime: Date = Environment.now()
     var additionalProperties = FilespacePropertyValues()
     let fileSaveWatcher: FileSaveWatcher
@@ -68,14 +86,15 @@ public final class Filespace {
             onSave(self)
         }
     }
-    
+
     public subscript<K>(
         dynamicMember dynamicMember: WritableKeyPath<FilespacePropertyValues, K>
     ) -> K {
         get { additionalProperties[keyPath: dynamicMember] }
         set { additionalProperties[keyPath: dynamicMember] = newValue }
     }
 
+    @WorkspaceActor
     public func reset() {
         suggestions = []
         suggestionIndex = 0
@@ -84,5 +103,27 @@ public final class Filespace {
     public func refreshUpdateTime() {
         lastSuggestionUpdateTime = Environment.now()
     }
+
+    @WorkspaceActor
+    public func setSuggestions(_ suggestions: [CodeSuggestion]) {
+        self.suggestions = suggestions
+        suggestionIndex = 0
+    }
+
+    @WorkspaceActor
+    public func nextSuggestion() {
+        suggestionIndex += 1
+        if suggestionIndex >= suggestions.endIndex {
+            suggestionIndex = 0
+        }
+    }
+
+    @WorkspaceActor
+    public func previousSuggestion() {
+        suggestionIndex -= 1
+        if suggestionIndex < 0 {
+            suggestionIndex = suggestions.endIndex - 1
+        }
+    }
 }