Match the develop branch CopilotForXcodeKit

Author: intitni

Pro

@@ -71,7 +71,7 @@ let package = Package(
             url: "https://github.com/intitni/generative-ai-swift",
             branch: "support-setting-base-url"
         ),
-        .package(url: "https://github.com/intitni/CopilotForXcodeKit", from: "0.4.0"),
+        .package(url: "https://github.com/intitni/CopilotForXcodeKit", branch: "develop"),
 
         // TreeSitter
         .package(url: "https://github.com/intitni/SwiftTreeSitter.git", branch: "main"),

Tool/Package.swift

@@ -5,7 +5,7 @@ import XcodeInspector
 
 public final class BuiltinExtensionManager {
     public static let shared: BuiltinExtensionManager = .init()
-    private(set) var extensions: [BuiltinExtension] = []
+    private(set) var extensions: [any BuiltinExtension] = []
 
     private var cancellable: Set<AnyCancellable> = []
 
@@ -17,7 +17,7 @@ public final class BuiltinExtensionManager {
         }.store(in: &cancellable)
     }
 
-    public func setupExtensions(_ extensions: [BuiltinExtension]) {
+    public func setupExtensions(_ extensions: [any BuiltinExtension]) {
         self.extensions = extensions
         checkAppConfiguration()
     }
@@ -36,9 +36,9 @@ extension BuiltinExtensionManager {
             let isSuggestionFeatureInUse = suggestionFeatureProvider ==
                 .builtIn(ext.suggestionServiceId)
             let isChatFeatureInUse = false
-            ext.appConfigurationDidChange(.init(
-                suggestionServiceInUse: isSuggestionFeatureInUse,
-                chatServiceInUse: isChatFeatureInUse
+            ext.extensionUsageDidChange(.init(
+                isSuggestionServiceInUse: isSuggestionFeatureInUse,
+                isChatServiceInUse: isChatFeatureInUse
             ))
         }
     }

Tool/Sources/BuiltinExtension/BuiltinExtensionManager.swift

@@ -52,7 +52,7 @@ public final class BuiltinExtensionWorkspacePlugin: WorkspacePlugin {
             for ext in extensionManager.extensions {
                 ext.workspace(
                     .init(workspaceURL: workspaceURL, projectURL: projectRootURL),
-                    didUpdateDocumentAt: filespace.fileURL,
+                    didUpdateDocumentAt: filespace.fileURL, 
                     content: content
                 )
             }

Tool/Sources/BuiltinExtension/BuiltinExtensionWorkspacePlugin.swift

@@ -11,14 +11,14 @@ public final class CodeiumExtension: BuiltinExtension {
     public var suggestionService: SuggestionServiceType? { _suggestionService }
     public var chatService: ChatServiceType? { nil }
     public var promptToCodeService: PromptToCodeServiceType? { nil }
-    private var appConfiguration = AppConfiguration(
-        suggestionServiceInUse: false,
-        chatServiceInUse: false
+    private var extensionUsage = ExtensionUsage(
+        isSuggestionServiceInUse: false,
+        isChatServiceInUse: false
     )
     private var isLanguageServerInUse: Bool {
-        appConfiguration.suggestionServiceInUse || appConfiguration.chatServiceInUse
+        extensionUsage.isSuggestionServiceInUse || extensionUsage.isChatServiceInUse
     }
-    
+
     let workspacePool: WorkspacePool
 
     let serviceLocator: ServiceLocator
@@ -73,7 +73,7 @@ public final class CodeiumExtension: BuiltinExtension {
     public func workspace(
         _ workspace: WorkspaceInfo,
         didUpdateDocumentAt documentURL: URL,
-        content: String
+        content: String?
     ) {
         guard isLanguageServerInUse else { return }
         // check if file size is larger than 15MB, if so, return immediately
@@ -85,7 +85,7 @@ public final class CodeiumExtension: BuiltinExtension {
 
         Task {
             do {
-                let content = try String(contentsOf: documentURL, encoding: .utf8)
+                guard let content else { return }
                 guard let service = await serviceLocator.getService(from: workspace) else { return }
                 try await service.notifyOpenTextDocument(fileURL: documentURL, content: content)
             } catch {
@@ -94,9 +94,9 @@ public final class CodeiumExtension: BuiltinExtension {
         }
     }
 
-    public func appConfigurationDidChange(_ configuration: AppConfiguration) {
-        appConfiguration = configuration
-        if !configuration.chatServiceInUse && !configuration.suggestionServiceInUse {
+    public func extensionUsageDidChange(_ usage: ExtensionUsage) {
+        extensionUsage = usage
+        if !usage.isChatServiceInUse && !usage.isSuggestionServiceInUse {
             for workspace in workspacePool.workspaces.values {
                 guard let plugin = workspace.plugin(for: CodeiumWorkspacePlugin.self)
                 else { continue }

Tool/Sources/CodeiumService/CodeiumExtension.swift

@@ -11,13 +11,14 @@ public final class GitHubCopilotExtension: BuiltinExtension {
     public var suggestionService: SuggestionServiceType? { _suggestionService }
     public var chatService: ChatServiceType? { nil }
     public var promptToCodeService: PromptToCodeServiceType? { nil }
-    private var appConfiguration = AppConfiguration(
-        suggestionServiceInUse: false,
-        chatServiceInUse: false
+    private var extensionUsage = ExtensionUsage(
+        isSuggestionServiceInUse: false,
+        isChatServiceInUse: false
     )
     private var isLanguageServerInUse: Bool {
-        appConfiguration.suggestionServiceInUse || appConfiguration.chatServiceInUse
+        extensionUsage.isSuggestionServiceInUse || extensionUsage.isChatServiceInUse
     }
+
     let workspacePool: WorkspacePool
 
     let serviceLocator: ServiceLocator
@@ -80,7 +81,7 @@ public final class GitHubCopilotExtension: BuiltinExtension {
     public func workspace(
         _ workspace: WorkspaceInfo,
         didUpdateDocumentAt documentURL: URL,
-        content: String
+        content: String?
     ) {
         guard isLanguageServerInUse else { return }
         // check if file size is larger than 15MB, if so, return immediately
@@ -92,7 +93,7 @@ public final class GitHubCopilotExtension: BuiltinExtension {
 
         Task {
             do {
-                let content = try String(contentsOf: documentURL, encoding: .utf8)
+                guard let content else { return }
                 guard let service = await serviceLocator.getService(from: workspace) else { return }
                 try await service.notifyOpenTextDocument(fileURL: documentURL, content: content)
             } catch {
@@ -101,9 +102,9 @@ public final class GitHubCopilotExtension: BuiltinExtension {
         }
     }
 
-    public func appConfigurationDidChange(_ configuration: AppConfiguration) {
-        appConfiguration = configuration
-        if !configuration.chatServiceInUse && !configuration.suggestionServiceInUse {
+    public func extensionUsageDidChange(_ usage: ExtensionUsage) {
+        extensionUsage = usage
+        if !usage.isChatServiceInUse && !usage.isSuggestionServiceInUse {
             for workspace in workspacePool.workspaces.values {
                 guard let plugin = workspace.plugin(for: GitHubCopilotWorkspacePlugin.self)
                 else { continue }