Fix builtin extensions

Author: intitni

Tool/Sources/BuiltinExtension/BuiltinExtensionSuggestionServiceProvider.swift

@@ -1,5 +1,6 @@
 import CopilotForXcodeKit
 import Foundation
+import Logger
 import Preferences
 import SuggestionModel
 import SuggestionProvider
@@ -31,12 +32,21 @@ public final class BuiltinExtensionSuggestionServiceProvider<
     var service: CopilotForXcodeKit.SuggestionServiceType? {
         extensionManager.extensions.first { $0 is T }?.suggestionService
     }
+    
+    struct BuiltinExtensionSuggestionServiceNotFoundError: Error, LocalizedError {
+        var errorDescription: String? {
+            "Builtin suggestion service not found."
+        }
+    }
 
     public func getSuggestions(
         _ request: SuggestionProvider.SuggestionRequest,
         workspaceInfo: CopilotForXcodeKit.WorkspaceInfo
     ) async throws -> [SuggestionModel.CodeSuggestion] {
-        guard let service else { return [] }
+        guard let service else {
+            Logger.service.error("Builtin suggestion service not found.")
+            throw BuiltinExtensionSuggestionServiceNotFoundError()
+        }
         return try await service.getSuggestions(
             .init(
                 fileURL: request.fileURL,
@@ -61,23 +71,32 @@ public final class BuiltinExtensionSuggestionServiceProvider<
     public func cancelRequest(
         workspaceInfo: CopilotForXcodeKit.WorkspaceInfo
     ) async {
-        guard let service else { return }
+        guard let service else {
+            Logger.service.error("Builtin suggestion service not found.")
+            return
+        }
         await service.cancelRequest(workspace: workspaceInfo)
     }
 
     public func notifyAccepted(
         _ suggestion: SuggestionModel.CodeSuggestion,
         workspaceInfo: CopilotForXcodeKit.WorkspaceInfo
     ) async {
-        guard let service else { return }
+        guard let service else {
+            Logger.service.error("Builtin suggestion service not found.")
+            return
+        }
         await service.notifyAccepted(suggestion.converted, workspace: workspaceInfo)
     }
 
     public func notifyRejected(
         _ suggestions: [SuggestionModel.CodeSuggestion],
         workspaceInfo: CopilotForXcodeKit.WorkspaceInfo
     ) async {
-        guard let service else { return }
+        guard let service else {
+            Logger.service.error("Builtin suggestion service not found.")
+            return
+        }
         await service.notifyRejected(suggestions.map(\.converted), workspace: workspaceInfo)
     }
 }

Tool/Sources/CodeiumService/CodeiumExtension.swift

@@ -8,9 +8,8 @@ import Workspace
 public final class CodeiumExtension: BuiltinExtension {
     public var suggestionServiceId: Preferences.BuiltInSuggestionFeatureProvider { .codeium }
 
-    public var suggestionService: SuggestionServiceType? { _suggestionService }
-    public var chatService: ChatServiceType? { nil }
-    public var promptToCodeService: PromptToCodeServiceType? { nil }
+    public let suggestionService: CodeiumSuggestionService?
+
     private var extensionUsage = ExtensionUsage(
         isSuggestionServiceInUse: false,
         isChatServiceInUse: false
@@ -22,12 +21,11 @@ public final class CodeiumExtension: BuiltinExtension {
     let workspacePool: WorkspacePool
 
     let serviceLocator: ServiceLocator
-    let _suggestionService: CodeiumSuggestionService
 
     public init(workspacePool: WorkspacePool) {
         self.workspacePool = workspacePool
         serviceLocator = .init(workspacePool: workspacePool)
-        _suggestionService = .init(serviceLocator: serviceLocator)
+        suggestionService = .init(serviceLocator: serviceLocator)
     }
 
     public func workspaceDidOpen(_: WorkspaceInfo) {}

Tool/Sources/CodeiumService/CodeiumSuggestionService.swift

@@ -3,8 +3,8 @@ import Foundation
 import SuggestionModel
 import Workspace
 
-class CodeiumSuggestionService: SuggestionServiceType {
-    var configuration: SuggestionServiceConfiguration {
+public final class CodeiumSuggestionService: SuggestionServiceType {
+    public var configuration: SuggestionServiceConfiguration {
         .init(
             acceptsRelevantCodeSnippets: true,
             mixRelevantCodeSnippetsInSource: true,
@@ -18,7 +18,7 @@ class CodeiumSuggestionService: SuggestionServiceType {
         self.serviceLocator = serviceLocator
     }
 
-    func getSuggestions(
+    public func getSuggestions(
         _ request: SuggestionRequest,
         workspace: WorkspaceInfo
     ) async throws -> [CopilotForXcodeKit.CodeSuggestion] {
@@ -36,22 +36,22 @@ class CodeiumSuggestionService: SuggestionServiceType {
         ).map(Self.convert)
     }
 
-    func notifyAccepted(
+    public func notifyAccepted(
         _ suggestion: CopilotForXcodeKit.CodeSuggestion,
         workspace: WorkspaceInfo
     ) async {
         guard let service = await serviceLocator.getService(from: workspace) else { return }
         await service.notifyAccepted(Self.convert(suggestion))
     }
 
-    func notifyRejected(
+    public func notifyRejected(
         _ suggestions: [CopilotForXcodeKit.CodeSuggestion],
         workspace: WorkspaceInfo
     ) async {
         // unimplemented
     }
 
-    func cancelRequest(workspace: WorkspaceInfo) async {
+    public func cancelRequest(workspace: WorkspaceInfo) async {
         guard let service = await serviceLocator.getService(from: workspace) else { return }
         await service.cancelRequest()
     }

Tool/Sources/GitHubCopilotService/GitHubCopilotExtension.swift

@@ -8,9 +8,8 @@ import Workspace
 public final class GitHubCopilotExtension: BuiltinExtension {
     public var suggestionServiceId: Preferences.BuiltInSuggestionFeatureProvider { .gitHubCopilot }
 
-    public var suggestionService: SuggestionServiceType? { _suggestionService }
-    public var chatService: ChatServiceType? { nil }
-    public var promptToCodeService: PromptToCodeServiceType? { nil }
+    public let suggestionService: GitHubCopilotSuggestionService?
+    
     private var extensionUsage = ExtensionUsage(
         isSuggestionServiceInUse: false,
         isChatServiceInUse: false
@@ -22,12 +21,11 @@ public final class GitHubCopilotExtension: BuiltinExtension {
     let workspacePool: WorkspacePool
 
     let serviceLocator: ServiceLocator
-    let _suggestionService: GitHubCopilotSuggestionService
 
     public init(workspacePool: WorkspacePool) {
         self.workspacePool = workspacePool
         serviceLocator = .init(workspacePool: workspacePool)
-        _suggestionService = .init(serviceLocator: serviceLocator)
+        suggestionService = .init(serviceLocator: serviceLocator)
     }
 
     public func workspaceDidOpen(_: WorkspaceInfo) {}

Tool/Sources/GitHubCopilotService/Services/GitHubCopilotSuggestionService.swift

@@ -3,8 +3,8 @@ import Foundation
 import SuggestionModel
 import Workspace
 
-class GitHubCopilotSuggestionService: SuggestionServiceType {
-    var configuration: SuggestionServiceConfiguration {
+public final class GitHubCopilotSuggestionService: SuggestionServiceType {
+    public var configuration: SuggestionServiceConfiguration {
         .init(
             acceptsRelevantCodeSnippets: true,
             mixRelevantCodeSnippetsInSource: true,
@@ -18,7 +18,7 @@ class GitHubCopilotSuggestionService: SuggestionServiceType {
         self.serviceLocator = serviceLocator
     }
 
-    func getSuggestions(
+    public func getSuggestions(
         _ request: SuggestionRequest,
         workspace: WorkspaceInfo
     ) async throws -> [CopilotForXcodeKit.CodeSuggestion] {
@@ -36,23 +36,23 @@ class GitHubCopilotSuggestionService: SuggestionServiceType {
         ).map(Self.convert)
     }
 
-    func notifyAccepted(
+    public func notifyAccepted(
         _ suggestion: CopilotForXcodeKit.CodeSuggestion,
         workspace: WorkspaceInfo
     ) async {
         guard let service = await serviceLocator.getService(from: workspace) else { return }
         await service.notifyAccepted(Self.convert(suggestion))
     }
 
-    func notifyRejected(
+    public func notifyRejected(
         _ suggestions: [CopilotForXcodeKit.CodeSuggestion],
         workspace: WorkspaceInfo
     ) async {
         guard let service = await serviceLocator.getService(from: workspace) else { return }
         await service.notifyRejected(suggestions.map(Self.convert))
     }
 
-    func cancelRequest(workspace: WorkspaceInfo) async {
+    public func cancelRequest(workspace: WorkspaceInfo) async {
         guard let service = await serviceLocator.getService(from: workspace) else { return }
         await service.cancelRequest()
     }