Rename CopilotService to GitHubCopilotService

intitni · intitni · commit bf04ddd89664 · 2023-05-04T16:35:37.000+08:00
diff --git a/Core/Package.swift b/Core/Package.swift
@@ -44,12 +44,12 @@ let package = Package(
     targets: [
         .target(name: "CGEventObserver"),
         .target(
-            name: "CopilotService",
+            name: "GitHubCopilotService",
             dependencies: ["LanguageClient", "CopilotModel", "XPCShared", "Preferences"]
         ),
         .testTarget(
-            name: "CopilotServiceTests",
-            dependencies: ["CopilotService"]
+            name: "GitHubCopilotServiceTests",
+            dependencies: ["GitHubCopilotService"]
         ),
         .target(
             name: "CopilotModel",
@@ -75,7 +75,7 @@ let package = Package(
             name: "Service",
             dependencies: [
                 "CopilotModel",
-                "CopilotService",
+                "GitHubCopilotService",
                 "OpenAIService",
                 "Preferences",
                 "XPCShared",
@@ -101,7 +101,7 @@ let package = Package(
             dependencies: [
                 "Service",
                 "Client",
-                "CopilotService",
+                "GitHubCopilotService",
                 "SuggestionInjector",
                 "Preferences",
                 "XPCShared",
@@ -115,7 +115,7 @@ let package = Package(
         .target(name: "AXNotificationStream"),
         .target(
             name: "Environment",
-            dependencies: ["ActiveApplicationMonitor", "CopilotService", "AXExtension"]
+            dependencies: ["ActiveApplicationMonitor", "GitHubCopilotService", "AXExtension"]
         ),
         .target(
             name: "SuggestionWidget",
@@ -159,8 +159,11 @@ let package = Package(
         .target(name: "ChatService", dependencies: ["OpenAIService", "ChatPlugins", "Environment"]),
         .target(
             name: "PromptToCodeService",
-            dependencies: ["OpenAIService", "Environment", "CopilotService", "CopilotModel"]
+            dependencies: ["OpenAIService", "Environment", "GitHubCopilotService", "CopilotModel"]
         ),
         .testTarget(name: "PromptToCodeServiceTests", dependencies: ["PromptToCodeService"]),
+        .target(name: "SuggestionService", dependencies: [
+            "GitHubCopilotService",
+        ])
     ]
 )
diff --git a/Core/Sources/CopilotModel/GitHubCopilotStatus.swift b/Core/Sources/CopilotModel/GitHubCopilotStatus.swift
diff --git a/Core/Sources/Environment/Environment.swift b/Core/Sources/Environment/Environment.swift
@@ -1,7 +1,7 @@
 import ActiveApplicationMonitor
 import AppKit
 import AXExtension
-import CopilotService
+import GitHubCopilotService
 import Foundation
 import Logger
 
diff --git a/Core/Sources/GitHubCopilotService/CopilotLocalProcessServer.swift b/Core/Sources/GitHubCopilotService/CopilotLocalProcessServer.swift
diff --git a/Core/Sources/GitHubCopilotService/CopilotRequest.swift b/Core/Sources/GitHubCopilotService/CopilotRequest.swift
diff --git a/Core/Sources/GitHubCopilotService/CopilotService.swift b/Core/Sources/GitHubCopilotService/CopilotService.swift
diff --git a/Core/Sources/GitHubCopilotService/LanguageIdentifierFromFilePath.swift b/Core/Sources/GitHubCopilotService/LanguageIdentifierFromFilePath.swift
diff --git a/Core/Sources/PromptToCodeService/CopilotPromptToCodeAPI.swift b/Core/Sources/PromptToCodeService/CopilotPromptToCodeAPI.swift
@@ -1,5 +1,5 @@
 import CopilotModel
-import CopilotService
+import GitHubCopilotService
 import Foundation
 import OpenAIService
 
diff --git a/Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift b/Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift
@@ -1,5 +1,5 @@
 import CopilotModel
-import CopilotService
+import GitHubCopilotService
 import Foundation
 import OpenAIService
 
diff --git a/Core/Sources/PromptToCodeService/PromptToCodeService.swift b/Core/Sources/PromptToCodeService/PromptToCodeService.swift
@@ -1,5 +1,5 @@
 import CopilotModel
-import CopilotService
+import GitHubCopilotService
 import Foundation
 import OpenAIService
 
diff --git a/Core/Sources/Service/GUI/WidgetDataSource.swift b/Core/Sources/Service/GUI/WidgetDataSource.swift
@@ -1,6 +1,6 @@
 import ChatService
 import CopilotModel
-import CopilotService
+import GitHubCopilotService
 import Foundation
 import OpenAIService
 import PromptToCodeService
diff --git a/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift
@@ -1,6 +1,6 @@
 import ChatService
 import CopilotModel
-import CopilotService
+import GitHubCopilotService
 import Environment
 import Foundation
 import LanguageServerProtocol
diff --git a/Core/Sources/Service/Workspace.swift b/Core/Sources/Service/Workspace.swift
@@ -1,6 +1,6 @@
 import ChatService
 import CopilotModel
-import CopilotService
+import GitHubCopilotService
 import Environment
 import Foundation
 import Logger
diff --git a/Core/Sources/Service/XPCService.swift b/Core/Sources/Service/XPCService.swift
@@ -1,5 +1,5 @@
 import AppKit
-import CopilotService
+import GitHubCopilotService
 import Environment
 import Foundation
 import LanguageServerProtocol
diff --git a/Core/Sources/SuggestionService/SuggestionService.swift b/Core/Sources/SuggestionService/SuggestionService.swift
@@ -0,0 +1,22 @@
+import Foundation
+
+protocol SuggestionServiceType {
+    func getCompletions(
+        fileURL: URL,
+        content: String,
+        cursorPosition: CursorPosition,
+        tabSize: Int,
+        indentSize: Int,
+        usesTabsForIndentation: Bool,
+        ignoreSpaceOnlySuggestions: Bool,
+        referenceFileURL: [URL]
+    ) async throws -> [CopilotCompletion]
+    
+    func notifyAccepted(_ completion: CopilotCompletion) async
+    func notifyRejected(_ completions: [CopilotCompletion]) async
+    func notifyOpenTextDocument(fileURL: URL, content: String) async throws
+    func notifyChangeTextDocument(fileURL: URL, content: String) async throws
+    func notifyCloseTextDocument(fileURL: URL) async throws
+    func notifySaveTextDocument(fileURL: URL) async throws
+}
+
diff --git a/Core/Tests/GithubCopilotServiceTests/FetchSuggestionsTests.swift b/Core/Tests/GithubCopilotServiceTests/FetchSuggestionsTests.swift
@@ -1,7 +1,7 @@
 import LanguageServerProtocol
 import XCTest
 
-@testable import CopilotService
+@testable import GitHubCopilotService
 
 final class FetchSuggestionTests: XCTestCase {
     func test_process_sugestions_from_server() async throws {
diff --git a/Core/Tests/GithubCopilotServiceTests/FileExtensionToLanguageIdentifierTests.swift b/Core/Tests/GithubCopilotServiceTests/FileExtensionToLanguageIdentifierTests.swift
@@ -1,7 +1,7 @@
 import LanguageServerProtocol
 import XCTest
 
-@testable import CopilotService
+@testable import GitHubCopilotService
 
 final class FileExtensionToLanguageIdentifierTests: XCTestCase {
     func test_no_conflicts_in_map() {
diff --git a/Core/Tests/ServiceTests/Environment.swift b/Core/Tests/ServiceTests/Environment.swift
@@ -1,7 +1,7 @@
 import AppKit
 import Client
 import CopilotModel
-import CopilotService
+import GitHubCopilotService
 import Environment
 import Foundation
 import XCTest
