Rename CopilotModel to SuggestionModel

intitni · intitni · commit 6dcc720e8b68 · 2023-05-04T16:50:53.000+08:00
diff --git a/Copilot for Xcode/AccountView.swift b/Copilot for Xcode/AccountView.swift
@@ -1,6 +1,6 @@
 import AppKit
 import Client
-import CopilotModel
+import SuggestionModel
 import SwiftUI
 
 struct AccountView: View {
diff --git a/Copilot for Xcode/ContentView.swift b/Copilot for Xcode/ContentView.swift
@@ -1,5 +1,5 @@
 import AppKit
-import CopilotModel
+import SuggestionModel
 import SwiftUI
 
 struct ContentView: View {
diff --git a/Copilot for Xcode/CopilotView.swift b/Copilot for Xcode/CopilotView.swift
@@ -1,6 +1,6 @@
 import AppKit
 import Client
-import CopilotModel
+import SuggestionModel
 import SwiftUI
 
 struct CopilotView: View {
diff --git a/Copilot for Xcode/OpenAIView.swift b/Copilot for Xcode/OpenAIView.swift
@@ -1,6 +1,6 @@
 import AppKit
 import Client
-import CopilotModel
+import SuggestionModel
 import Preferences
 import SwiftUI
 
diff --git a/Core/Package.swift b/Core/Package.swift
@@ -21,7 +21,7 @@ let package = Package(
         .library(
             name: "Client",
             targets: [
-                "CopilotModel",
+                "SuggestionModel",
                 "Client",
                 "XPCShared",
                 "Preferences",
@@ -45,36 +45,36 @@ let package = Package(
         .target(name: "CGEventObserver"),
         .target(
             name: "GitHubCopilotService",
-            dependencies: ["LanguageClient", "CopilotModel", "XPCShared", "Preferences"]
+            dependencies: ["LanguageClient", "SuggestionModel", "XPCShared", "Preferences"]
         ),
         .testTarget(
             name: "GitHubCopilotServiceTests",
             dependencies: ["GitHubCopilotService"]
         ),
         .target(
-            name: "CopilotModel",
+            name: "SuggestionModel",
             dependencies: ["LanguageClient"]
         ),
         .testTarget(
-            name: "CopilotModelTests",
-            dependencies: ["CopilotModel"]
+            name: "SuggestionModelTests",
+            dependencies: ["SuggestionModel"]
         ),
         .target(
             name: "SuggestionInjector",
-            dependencies: ["CopilotModel"]
+            dependencies: ["SuggestionModel"]
         ),
         .testTarget(
             name: "SuggestionInjectorTests",
             dependencies: ["SuggestionInjector"]
         ),
         .target(
             name: "Client",
-            dependencies: ["CopilotModel", "Preferences", "XPCShared", "Logger"]
+            dependencies: ["SuggestionModel", "Preferences", "XPCShared", "Logger"]
         ),
         .target(
             name: "Service",
             dependencies: [
-                "CopilotModel",
+                "SuggestionModel",
                 "GitHubCopilotService",
                 "OpenAIService",
                 "Preferences",
@@ -94,7 +94,7 @@ let package = Package(
         ),
         .target(
             name: "XPCShared",
-            dependencies: ["CopilotModel"]
+            dependencies: ["SuggestionModel"]
         ),
         .testTarget(
             name: "ServiceTests",
@@ -159,7 +159,7 @@ let package = Package(
         .target(name: "ChatService", dependencies: ["OpenAIService", "ChatPlugins", "Environment"]),
         .target(
             name: "PromptToCodeService",
-            dependencies: ["OpenAIService", "Environment", "GitHubCopilotService", "CopilotModel"]
+            dependencies: ["OpenAIService", "Environment", "GitHubCopilotService", "SuggestionModel"]
         ),
         .testTarget(name: "PromptToCodeServiceTests", dependencies: ["PromptToCodeService"]),
         .target(name: "SuggestionService", dependencies: [
diff --git a/Core/Sources/Client/AsyncXPCService.swift b/Core/Sources/Client/AsyncXPCService.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import Foundation
 import Logger
 import XPCShared
diff --git a/Core/Sources/GitHubCopilotService/CopilotRequest.swift b/Core/Sources/GitHubCopilotService/CopilotRequest.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import Foundation
 import JSONRPC
 import LanguageServerProtocol
diff --git a/Core/Sources/GitHubCopilotService/CopilotService.swift b/Core/Sources/GitHubCopilotService/CopilotService.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import Foundation
 import LanguageClient
 import LanguageServerProtocol
diff --git a/Core/Sources/PromptToCodeService/CopilotPromptToCodeAPI.swift b/Core/Sources/PromptToCodeService/CopilotPromptToCodeAPI.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import GitHubCopilotService
 import Foundation
 import OpenAIService
diff --git a/Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift b/Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import GitHubCopilotService
 import Foundation
 import OpenAIService
diff --git a/Core/Sources/PromptToCodeService/PromptToCodeService.swift b/Core/Sources/PromptToCodeService/PromptToCodeService.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import GitHubCopilotService
 import Foundation
 import OpenAIService
diff --git a/Core/Sources/Service/GUI/WidgetDataSource.swift b/Core/Sources/Service/GUI/WidgetDataSource.swift
@@ -1,5 +1,5 @@
 import ChatService
-import CopilotModel
+import SuggestionModel
 import GitHubCopilotService
 import Foundation
 import OpenAIService
diff --git a/Core/Sources/Service/SuggestionCommandHandler/CommentBaseCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/CommentBaseCommandHandler.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import Environment
 import Foundation
 import SuggestionInjector
diff --git a/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift
@@ -1,6 +1,6 @@
 import ActiveApplicationMonitor
 import AppKit
-import CopilotModel
+import SuggestionModel
 import Environment
 import Preferences
 import SuggestionInjector
diff --git a/Core/Sources/Service/SuggestionCommandHandler/SuggestionCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/SuggestionCommandHandler.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import XPCShared
 
 protocol SuggestionCommandHandler {
diff --git a/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift
@@ -1,5 +1,5 @@
 import ChatService
-import CopilotModel
+import SuggestionModel
 import GitHubCopilotService
 import Environment
 import Foundation
diff --git a/Core/Sources/Service/SuggestionPresenter/PresentInCommentSuggestionPresenter.swift b/Core/Sources/Service/SuggestionPresenter/PresentInCommentSuggestionPresenter.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import Foundation
 import SuggestionInjector
 import XPCShared
diff --git a/Core/Sources/Service/SuggestionPresenter/PresentInWindowSuggestionPresenter.swift b/Core/Sources/Service/SuggestionPresenter/PresentInWindowSuggestionPresenter.swift
@@ -1,5 +1,5 @@
 import ChatService
-import CopilotModel
+import SuggestionModel
 import Foundation
 import OpenAIService
 import SuggestionWidget
diff --git a/Core/Sources/Service/Workspace.swift b/Core/Sources/Service/Workspace.swift
@@ -1,5 +1,5 @@
 import ChatService
-import CopilotModel
+import SuggestionModel
 import GitHubCopilotService
 import Environment
 import Foundation
diff --git a/Core/Sources/SuggestionInjector/SuggestionInjector.swift b/Core/Sources/SuggestionInjector/SuggestionInjector.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import Foundation
 
 let suggestionStart = "/*========== Copilot Suggestion"
diff --git a/Core/Sources/SuggestionModel/CodeSuggestion.swift b/Core/Sources/SuggestionModel/CodeSuggestion.swift
diff --git a/Core/Sources/SuggestionModel/ExportedFromLSP.swift b/Core/Sources/SuggestionModel/ExportedFromLSP.swift
diff --git a/Core/Sources/SuggestionModel/Modification.swift b/Core/Sources/SuggestionModel/Modification.swift
diff --git a/Core/Sources/XPCShared/Models.swift b/Core/Sources/XPCShared/Models.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import Foundation
 
 public struct EditorContent: Codable {
diff --git a/Core/Sources/XPCShared/XPCServiceProtocol.swift b/Core/Sources/XPCShared/XPCServiceProtocol.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import Foundation
 
 @objc(XPCServiceProtocol)
diff --git a/Core/Tests/ServiceTests/Environment.swift b/Core/Tests/ServiceTests/Environment.swift
@@ -1,6 +1,6 @@
 import AppKit
 import Client
-import CopilotModel
+import SuggestionModel
 import GitHubCopilotService
 import Environment
 import Foundation
@@ -65,12 +65,12 @@ class MockSuggestionService: CopilotSuggestionServiceType {
     func getCompletions(
         fileURL: URL,
         content: String,
-        cursorPosition: CopilotModel.CursorPosition,
+        cursorPosition: SuggestionModel.CursorPosition,
         tabSize: Int,
         indentSize: Int,
         usesTabsForIndentation: Bool,
         ignoreSpaceOnlySuggestions: Bool
-    ) async throws -> [CopilotModel.CodeSuggestion] {
+    ) async throws -> [SuggestionModel.CodeSuggestion] {
         completions
     }
 
diff --git a/Core/Tests/ServiceTests/ExtractSelectedCodeTests.swift b/Core/Tests/ServiceTests/ExtractSelectedCodeTests.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import XCTest
 @testable import Service
 @testable import XPCShared
diff --git a/Core/Tests/ServiceTests/PseudoCommandHandlerFileProcessingTests.swift b/Core/Tests/ServiceTests/PseudoCommandHandlerFileProcessingTests.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import XCTest
 @testable import Service
 
diff --git a/Core/Tests/SuggestionInjectorTests/AcceptSuggestionTests.swift b/Core/Tests/SuggestionInjectorTests/AcceptSuggestionTests.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import XCTest
 
 @testable import SuggestionInjector
diff --git a/Core/Tests/SuggestionInjectorTests/ProposeSuggestionTests.swift b/Core/Tests/SuggestionInjectorTests/ProposeSuggestionTests.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import XCTest
 
 @testable import SuggestionInjector
diff --git a/Core/Tests/SuggestionInjectorTests/RejectSuggestionTests.swift b/Core/Tests/SuggestionInjectorTests/RejectSuggestionTests.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import XCTest
 
 @testable import SuggestionInjector
diff --git a/Core/Tests/SuggestionModelTests/ModificationTests.swift b/Core/Tests/SuggestionModelTests/ModificationTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 
-@testable import CopilotModel
+@testable import SuggestionModel
 
 final class ModificationTests: XCTestCase {
     func test_nsmutablearray_deleting_an_element() {
diff --git a/EditorExtension/AcceptSuggestionCommand.swift b/EditorExtension/AcceptSuggestionCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 import XPCShared
diff --git a/EditorExtension/ChatWithSelection.swift b/EditorExtension/ChatWithSelection.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/CustomCommand.swift b/EditorExtension/CustomCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/GetSuggestionsCommand.swift b/EditorExtension/GetSuggestionsCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/Helpers.swift b/EditorExtension/Helpers.swift
@@ -1,4 +1,4 @@
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 import XPCShared
diff --git a/EditorExtension/NextSuggestionCommand.swift b/EditorExtension/NextSuggestionCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/PrefetchSuggestionsCommand.swift b/EditorExtension/PrefetchSuggestionsCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/PreviousSuggestionCommand.swift b/EditorExtension/PreviousSuggestionCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/PromptToCodeCommand.swift b/EditorExtension/PromptToCodeCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/RealtimeSuggestionCommand.swift b/EditorExtension/RealtimeSuggestionCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/RejectSuggestionCommand.swift b/EditorExtension/RejectSuggestionCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/SeparatorCommand.swift b/EditorExtension/SeparatorCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 
diff --git a/EditorExtension/ToggleRealtimeSuggestionsCommand.swift b/EditorExtension/ToggleRealtimeSuggestionsCommand.swift
@@ -1,5 +1,5 @@
 import Client
-import CopilotModel
+import SuggestionModel
 import Foundation
 import XcodeKit
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import CopilotModel`
	`1`	`+import SuggestionModel`
`2`	`2`	`import Foundation`
`3`	`3`	`import Logger`
`4`	`4`	`import XPCShared`