Remove Environment.createAuthService

intitni · intitni · commit 0c09a2d9ccb1 · 2023-05-04T17:21:25.000+08:00
diff --git a/Core/Package.swift b/Core/Package.swift
@@ -52,6 +52,7 @@ let package = Package(
             name: "Service",
             dependencies: [
                 "SuggestionModel",
+                "SuggestionService",
                 "GitHubCopilotService",
                 "OpenAIService",
                 "Preferences",
diff --git a/Core/Sources/Environment/Environment.swift b/Core/Sources/Environment/Environment.swift
@@ -1,9 +1,10 @@
 import ActiveApplicationMonitor
 import AppKit
 import AXExtension
-import GitHubCopilotService
 import Foundation
+import GitHubCopilotService
 import Logger
+import SuggestionService
 
 public struct NoAccessToAccessibilityAPIError: Error, LocalizedError {
     public var errorDescription: String? {
@@ -105,32 +106,28 @@ public enum Environment {
         }
         throw FailedToFetchFileURLError()
     }
-    
+
     public static var fetchFocusedElementURI: () async throws -> URL = {
         guard let xcode = ActiveApplicationMonitor.activeXcode
             ?? ActiveApplicationMonitor.latestXcode
         else {
             throw FailedToFetchFileURLError()
         }
-        
+
         let application = AXUIElementCreateApplication(xcode.processIdentifier)
         let focusedElement = application.focusedElement
         if focusedElement?.description != "Source Editor" {
             let window = application.focusedWindow
             let id = window?.identifier.hashValue
             return URL(fileURLWithPath: "/xcode-focused-element/\(id ?? 0)")
         }
-        
-        return try await fetchCurrentFileURL()
-    }
 
-    public static var createAuthService: () -> GitHubCopilotAuthServiceType = {
-        GitHubCopilotAuthService()
+        return try await fetchCurrentFileURL()
     }
 
     public static var createSuggestionService: (_ projectRootURL: URL)
-        -> GitHubCopilotSuggestionServiceType = { projectRootURL in
-            GitHubCopilotSuggestionService(projectRootURL: projectRootURL)
+        -> SuggestionServiceType = { projectRootURL in
+            SuggestionService(projectRootURL: projectRootURL)
         }
 
     public static var triggerAction: (_ name: String) async throws -> Void = { name in
@@ -139,7 +136,7 @@ public enum Environment {
         else { return }
         let bundleName = Bundle.main
             .object(forInfoDictionaryKey: "EXTENSION_BUNDLE_NAME") as! String
-        
+
         await Task.yield()
 
         if UserDefaults.shared.value(for: \.triggerActionWithAccessibilityAPI) {
@@ -173,7 +170,7 @@ public enum Environment {
                         "Can't run command \(name)."
                     }
                 }
-                
+
                 throw CantRunCommand(name: name)
             }
         } else {
@@ -254,3 +251,4 @@ extension FileManager {
         return isDirectory.boolValue && exists
     }
 }
+
diff --git a/Core/Sources/Service/Workspace.swift b/Core/Sources/Service/Workspace.swift
@@ -1,11 +1,12 @@
 import ChatService
-import SuggestionModel
-import GitHubCopilotService
 import Environment
 import Foundation
+import GitHubCopilotService
 import Logger
 import Preferences
 import SuggestionInjector
+import SuggestionModel
+import SuggestionService
 import XPCShared
 
 @ServiceActor
@@ -91,25 +92,25 @@ final class Workspace {
         ], context: nil
     )
 
-    private var _copilotSuggestionService: GitHubCopilotSuggestionServiceType?
+    private var _suggestionService: SuggestionServiceType?
 
-    private var copilotSuggestionService: GitHubCopilotSuggestionServiceType? {
+    private var suggestionService: SuggestionServiceType? {
         // Check if the workspace is disabled.
         let isSuggestionDisabledGlobally = UserDefaults.shared
             .value(for: \.disableSuggestionFeatureGlobally)
         if isSuggestionDisabledGlobally {
             let enabledList = UserDefaults.shared.value(for: \.suggestionFeatureEnabledProjectList)
             if !enabledList.contains(where: { path in projectRootURL.path.hasPrefix(path) }) {
                 // If it's disable, remove the service
-                _copilotSuggestionService = nil
+                _suggestionService = nil
                 return nil
             }
         }
 
-        if _copilotSuggestionService == nil {
-            _copilotSuggestionService = Environment.createSuggestionService(projectRootURL)
+        if _suggestionService == nil {
+            _suggestionService = Environment.createSuggestionService(projectRootURL)
         }
-        return _copilotSuggestionService
+        return _suggestionService
     }
 
     var isSuggestionFeatureEnabled: Bool {
@@ -129,10 +130,10 @@ final class Workspace {
 
         userDefaultsObserver.onChange = { [weak self] in
             guard let self else { return }
-            _ = self.copilotSuggestionService
+            _ = self.suggestionService
         }
     }
-    
+
     func refreshUpdateTime() {
         lastSuggestionUpdateTime = Environment.now()
     }
@@ -219,15 +220,16 @@ extension Workspace {
 
         filespace.suggestionSourceSnapshot = snapshot
 
-        guard let copilotSuggestionService else { throw SuggestionFeatureDisabledError() }
-        let completions = try await copilotSuggestionService.getCompletions(
+        guard let suggestionService else { throw SuggestionFeatureDisabledError() }
+        let completions = try await suggestionService.getSuggestions(
             fileURL: fileURL,
             content: editor.lines.joined(separator: ""),
             cursorPosition: editor.cursorPosition,
             tabSize: editor.tabSize,
             indentSize: editor.indentSize,
             usesTabsForIndentation: editor.usesTabsForIndentation,
-            ignoreSpaceOnlySuggestions: true
+            ignoreSpaceOnlySuggestions: true,
+            referenceFileURL: filespaces.values.map(\.fileURL)
         )
 
         filespace.suggestions = completions
@@ -271,7 +273,7 @@ extension Workspace {
             filespaces[fileURL]?.usesTabsForIndentation = editor.usesTabsForIndentation
         }
         Task {
-            await copilotSuggestionService?.notifyRejected(filespaces[fileURL]?.suggestions ?? [])
+            await suggestionService?.notifyRejected(filespaces[fileURL]?.suggestions ?? [])
         }
         filespaces[fileURL]?.reset(resetSnapshot: false)
     }
@@ -296,8 +298,8 @@ extension Workspace {
         let suggestion = allSuggestions.remove(at: filespace.suggestionIndex)
 
         Task {
-            await copilotSuggestionService?.notifyAccepted(suggestion)
-            await copilotSuggestionService?.notifyRejected(allSuggestions)
+            await suggestionService?.notifyAccepted(suggestion)
+            await suggestionService?.notifyRejected(allSuggestions)
         }
 
         filespaces[fileURL]?.reset()
@@ -308,7 +310,7 @@ extension Workspace {
     func notifyOpenFile(filespace: Filespace) {
         refreshUpdateTime()
         Task {
-            try await copilotSuggestionService?.notifyOpenTextDocument(
+            try await suggestionService?.notifyOpenTextDocument(
                 fileURL: filespace.fileURL,
                 content: try String(contentsOf: filespace.fileURL, encoding: .utf8)
             )
@@ -319,7 +321,7 @@ extension Workspace {
         filespace.refreshUpdateTime()
         refreshUpdateTime()
         Task {
-            try await copilotSuggestionService?.notifyChangeTextDocument(
+            try await suggestionService?.notifyChangeTextDocument(
                 fileURL: filespace.fileURL,
                 content: content
             )
@@ -330,7 +332,7 @@ extension Workspace {
         filespace.refreshUpdateTime()
         refreshUpdateTime()
         Task {
-            try await copilotSuggestionService?.notifySaveTextDocument(fileURL: filespace.fileURL)
+            try await suggestionService?.notifySaveTextDocument(fileURL: filespace.fileURL)
         }
     }
 }
@@ -340,7 +342,7 @@ extension Workspace {
         for (fileURL, _) in filespaces {
             if isFilespaceExpired(fileURL: fileURL, availableTabs: availableTabs) {
                 Task {
-                    try await copilotSuggestionService?.notifyCloseTextDocument(fileURL: fileURL)
+                    try await suggestionService?.notifyCloseTextDocument(fileURL: fileURL)
                 }
                 filespaces[fileURL] = nil
             }
diff --git a/Core/Sources/Service/XPCService.swift b/Core/Sources/Service/XPCService.swift
@@ -32,12 +32,12 @@ public class XPCService: NSObject, XPCServiceProtocol {
     // MARK: - Copilot Auth
 
     @ServiceActor
-    lazy var authService: GitHubCopilotAuthServiceType = Environment.createAuthService()
+    lazy var gitHubCopilotAuthService: GitHubCopilotAuthServiceType = GitHubCopilotAuthService()
 
     public func checkStatus(withReply reply: @escaping (String?, Error?) -> Void) {
         Task { @ServiceActor in
             do {
-                let status = try await authService.checkStatus()
+                let status = try await gitHubCopilotAuthService.checkStatus()
                 reply(status.rawValue, nil)
             } catch {
                 reply(nil, NSError.from(error))
@@ -48,7 +48,7 @@ public class XPCService: NSObject, XPCServiceProtocol {
     public func signInInitiate(withReply reply: @escaping (String?, String?, Error?) -> Void) {
         Task { @ServiceActor in
             do {
-                let (verificationLink, userCode) = try await authService.signInInitiate()
+                let (verificationLink, userCode) = try await gitHubCopilotAuthService.signInInitiate()
                 reply(verificationLink, userCode, nil)
             } catch {
                 reply(nil, nil, NSError.from(error))
@@ -62,7 +62,7 @@ public class XPCService: NSObject, XPCServiceProtocol {
     ) {
         Task { @ServiceActor in
             do {
-                let (username, status) = try await authService.signInConfirm(userCode: userCode)
+                let (username, status) = try await gitHubCopilotAuthService.signInConfirm(userCode: userCode)
                 reply(username, status.rawValue, nil)
             } catch {
                 reply(nil, nil, NSError.from(error))
@@ -73,7 +73,7 @@ public class XPCService: NSObject, XPCServiceProtocol {
     public func getVersion(withReply reply: @escaping (String?, Error?) -> Void) {
         Task { @ServiceActor in
             do {
-                let version = try await authService.version()
+                let version = try await gitHubCopilotAuthService.version()
                 reply(version, nil)
             } catch {
                 reply(nil, NSError.from(error))
@@ -84,7 +84,7 @@ public class XPCService: NSObject, XPCServiceProtocol {
     public func signOut(withReply reply: @escaping (String?, Error?) -> Void) {
         Task { @ServiceActor in
             do {
-                let status = try await authService.signOut()
+                let status = try await gitHubCopilotAuthService.signOut()
                 reply(status.rawValue, nil)
             } catch {
                 reply(nil, NSError.from(error))
diff --git a/Core/Sources/SuggestionService/SuggestionService.swift b/Core/Sources/SuggestionService/SuggestionService.swift
@@ -2,7 +2,7 @@ import Foundation
 import SuggestionModel
 import GitHubCopilotService
 
-protocol SuggestionServiceType {
+public protocol SuggestionServiceType {
     func getSuggestions(
         fileURL: URL,
         content: String,
@@ -23,31 +23,54 @@ protocol SuggestionServiceType {
 }
 
 public final class SuggestionService: SuggestionServiceType {
-    func getSuggestions(fileURL: URL, content: String, cursorPosition: SuggestionModel.CursorPosition, tabSize: Int, indentSize: Int, usesTabsForIndentation: Bool, ignoreSpaceOnlySuggestions: Bool, referenceFileURL: [URL]) async throws -> [SuggestionModel.CodeSuggestion] {
-        fatalError()
+    let gitHubCopilotService: GitHubCopilotSuggestionServiceType
+    
+    public init(projectRootURL: URL) {
+        gitHubCopilotService = GitHubCopilotSuggestionService(projectRootURL: projectRootURL)
+    }
+    
+    public func getSuggestions(
+        fileURL: URL,
+        content: String,
+        cursorPosition: SuggestionModel.CursorPosition,
+        tabSize: Int,
+        indentSize: Int,
+        usesTabsForIndentation: Bool,
+        ignoreSpaceOnlySuggestions: Bool,
+        referenceFileURL: [URL]
+    ) async throws -> [SuggestionModel.CodeSuggestion] {
+        try await gitHubCopilotService.getCompletions(
+            fileURL: fileURL,
+            content: content,
+            cursorPosition: cursorPosition,
+            tabSize: tabSize,
+            indentSize: indentSize,
+            usesTabsForIndentation: usesTabsForIndentation,
+            ignoreSpaceOnlySuggestions: ignoreSpaceOnlySuggestions
+        )
     }
     
-    func notifyAccepted(_ suggestion: SuggestionModel.CodeSuggestion) async {
-        fatalError()
+    public func notifyAccepted(_ suggestion: SuggestionModel.CodeSuggestion) async {
+        await gitHubCopilotService.notifyAccepted(suggestion)
     }
     
-    func notifyRejected(_ suggestions: [SuggestionModel.CodeSuggestion]) async {
-        fatalError()
+    public func notifyRejected(_ suggestions: [SuggestionModel.CodeSuggestion]) async {
+        await gitHubCopilotService.notifyRejected(suggestions)
     }
     
-    func notifyOpenTextDocument(fileURL: URL, content: String) async throws {
-        fatalError()
+    public func notifyOpenTextDocument(fileURL: URL, content: String) async throws {
+        try await gitHubCopilotService.notifyOpenTextDocument(fileURL: fileURL, content: content)
     }
     
-    func notifyChangeTextDocument(fileURL: URL, content: String) async throws {
-        fatalError()
+    public func notifyChangeTextDocument(fileURL: URL, content: String) async throws {
+        try await gitHubCopilotService.notifyChangeTextDocument(fileURL: fileURL, content: content)
     }
     
-    func notifyCloseTextDocument(fileURL: URL) async throws {
-        fatalError()
+    public func notifyCloseTextDocument(fileURL: URL) async throws {
+        try await gitHubCopilotService.notifyCloseTextDocument(fileURL: fileURL)
     }
     
-    func notifySaveTextDocument(fileURL: URL) async throws {
-        fatalError()
+    public func notifySaveTextDocument(fileURL: URL) async throws {
+        try await gitHubCopilotService.notifySaveTextDocument(fileURL: fileURL)
     }
 }
diff --git a/Core/Tests/ServiceTests/Environment.swift b/Core/Tests/ServiceTests/Environment.swift
@@ -22,10 +22,6 @@ import XPCShared
         URL(fileURLWithPath: "/path/to/project/file.swift")
     }
 
-    Environment.createAuthService = {
-        fatalError("")
-    }
-
     Environment.createSuggestionService = {
         _ in fatalError("")
     }

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,6 @@ import XPCShared`
`22`	`22`	`URL(fileURLWithPath: "/path/to/project/file.swift")`
`23`	`23`	`}`
`24`	`24`
`25`		`- Environment.createAuthService = {`
`26`		`- fatalError("")`
`27`		`- }`
`28`		`-`
`29`	`25`	`Environment.createSuggestionService = {`
`30`	`26`	`_ in fatalError("")`
`31`	`27`	`}`