Add missing import

Author: intitni

Copilot for Xcode/ContentView.swift

@@ -1,4 +1,5 @@
 import AppKit
+import GitHubCopilotService
 import SuggestionModel
 import SwiftUI
 
@@ -45,3 +46,4 @@ struct ContentView_Previews: PreviewProvider {
             .frame(height: 1200)
     }
 }
+

Copilot for Xcode/CopilotView.swift

@@ -1,5 +1,6 @@
 import AppKit
 import Client
+import GitHubCopilotService
 import SuggestionModel
 import SwiftUI
 
@@ -183,3 +184,4 @@ struct CopilotView_Previews: PreviewProvider {
         .background(Color.black)
     }
 }
+

Core/Package.swift

@@ -22,6 +22,7 @@ let package = Package(
             name: "Client",
             targets: [
                 "SuggestionModel",
+                "GitHubCopilotService",
                 "Client",
                 "XPCShared",
                 "Preferences",

Core/Sources/Client/AsyncXPCService.swift

@@ -1,6 +1,7 @@
-import SuggestionModel
 import Foundation
+import GitHubCopilotService
 import Logger
+import SuggestionModel
 import XPCShared
 
 public struct AsyncXPCService {
@@ -89,7 +90,10 @@ public struct AsyncXPCService {
                     return
                 }
                 continuation
-                    .resume(finishstatus.flatMap(GitHubCopilotAccountStatus.init(rawValue:)) ?? .notSignedIn)
+                    .resume(
+                        finishstatus
+                            .flatMap(GitHubCopilotAccountStatus.init(rawValue:)) ?? .notSignedIn
+                    )
             }
         }
     }
@@ -257,3 +261,4 @@ func suggestionRequest(
         }
     }
 }
+

Core/Sources/PromptToCodeService/CopilotPromptToCodeAPI.swift

@@ -1,7 +1,7 @@
-import SuggestionModel
-import GitHubCopilotService
 import Foundation
+import GitHubCopilotService
 import OpenAIService
+import SuggestionModel
 
 final class CopilotPromptToCodeAPI: PromptToCodeAPI {
     var task: Task<Void, Never>?
@@ -36,11 +36,11 @@ final class CopilotPromptToCodeAPI: PromptToCodeAPI {
             }
             return filePath
         }()
-        
+
         func convertToComment(_ s: String) -> String {
             s.split(separator: "\n").map { "// \($0)" }.joined(separator: "\n")
         }
-        
+
         let comment = """
         // A file to refactor the following code
         //
@@ -52,9 +52,9 @@ final class CopilotPromptToCodeAPI: PromptToCodeAPI {
         // Requirements:
         \(convertToComment((extraSystemPrompt ?? "\n") + requirement))
         //
-        
-        
-        
+
+
+
         // end of file
         """
         let lineCount = comment.breakLines().count
@@ -98,3 +98,4 @@ extension String {
         return all
     }
 }
+

Core/Sources/Service/XPCService.swift

@@ -1,7 +1,7 @@
 import AppKit
-import GitHubCopilotService
 import Environment
 import Foundation
+import GitHubCopilotService
 import LanguageServerProtocol
 import Logger
 import Preferences
@@ -48,7 +48,8 @@ public class XPCService: NSObject, XPCServiceProtocol {
     public func signInInitiate(withReply reply: @escaping (String?, String?, Error?) -> Void) {
         Task { @ServiceActor in
             do {
-                let (verificationLink, userCode) = try await gitHubCopilotAuthService.signInInitiate()
+                let (verificationLink, userCode) = try await gitHubCopilotAuthService
+                    .signInInitiate()
                 reply(verificationLink, userCode, nil)
             } catch {
                 reply(nil, nil, NSError.from(error))
@@ -62,7 +63,8 @@ public class XPCService: NSObject, XPCServiceProtocol {
     ) {
         Task { @ServiceActor in
             do {
-                let (username, status) = try await gitHubCopilotAuthService.signInConfirm(userCode: userCode)
+                let (username, status) = try await gitHubCopilotAuthService
+                    .signInConfirm(userCode: userCode)
                 reply(username, status.rawValue, nil)
             } catch {
                 reply(nil, nil, NSError.from(error))
@@ -260,3 +262,4 @@ public class XPCService: NSObject, XPCServiceProtocol {
         }
     }
 }
+

Core/Sources/SuggestionService/SuggestionService.swift

@@ -1,6 +1,6 @@
 import Foundation
-import SuggestionModel
 import GitHubCopilotService
+import SuggestionModel
 
 public protocol SuggestionServiceType {
     func getSuggestions(
@@ -13,7 +13,7 @@ public protocol SuggestionServiceType {
         ignoreSpaceOnlySuggestions: Bool,
         referenceFileURL: [URL]
     ) async throws -> [CodeSuggestion]
-    
+
     func notifyAccepted(_ suggestion: CodeSuggestion) async
     func notifyRejected(_ suggestions: [CodeSuggestion]) async
     func notifyOpenTextDocument(fileURL: URL, content: String) async throws
@@ -24,11 +24,11 @@ public protocol SuggestionServiceType {
 
 public final class SuggestionService: SuggestionServiceType {
     let gitHubCopilotService: GitHubCopilotSuggestionServiceType
-    
+
     public init(projectRootURL: URL) {
         gitHubCopilotService = GitHubCopilotSuggestionService(projectRootURL: projectRootURL)
     }
-    
+
     public func getSuggestions(
         fileURL: URL,
         content: String,
@@ -49,28 +49,29 @@ public final class SuggestionService: SuggestionServiceType {
             ignoreSpaceOnlySuggestions: ignoreSpaceOnlySuggestions
         )
     }
-    
+
     public func notifyAccepted(_ suggestion: SuggestionModel.CodeSuggestion) async {
         await gitHubCopilotService.notifyAccepted(suggestion)
     }
-    
+
     public func notifyRejected(_ suggestions: [SuggestionModel.CodeSuggestion]) async {
         await gitHubCopilotService.notifyRejected(suggestions)
     }
-    
+
     public func notifyOpenTextDocument(fileURL: URL, content: String) async throws {
         try await gitHubCopilotService.notifyOpenTextDocument(fileURL: fileURL, content: content)
     }
-    
+
     public func notifyChangeTextDocument(fileURL: URL, content: String) async throws {
         try await gitHubCopilotService.notifyChangeTextDocument(fileURL: fileURL, content: content)
     }
-    
+
     public func notifyCloseTextDocument(fileURL: URL) async throws {
         try await gitHubCopilotService.notifyCloseTextDocument(fileURL: fileURL)
     }
-    
+
     public func notifySaveTextDocument(fileURL: URL) async throws {
         try await gitHubCopilotService.notifySaveTextDocument(fileURL: fileURL)
     }
 }
+