Bump GitHub Copilot language server

Author: intitni

Core/Sources/HostApp/AccountSettings/GitHubCopilotView.swift

@@ -158,7 +158,7 @@ struct GitHubCopilotView: View {
                                 "node"
                             )
                         ) {
-                            Text("Path to Node (v20.8+)")
+                            Text("Path to Node (v22.0+)")
                         }
 
                         Text(

Tool/Sources/GitHubCopilotService/GitHubCopilotExtension.swift

@@ -1,9 +1,11 @@
 import BuiltinExtension
 import CopilotForXcodeKit
+import Dependencies
 import Foundation
 import LanguageServerProtocol
 import Logger
 import Preferences
+import Toast
 import Workspace
 
 public final class GitHubCopilotExtension: BuiltinExtension {
@@ -20,6 +22,8 @@ public final class GitHubCopilotExtension: BuiltinExtension {
         extensionUsage.isSuggestionServiceInUse || extensionUsage.isChatServiceInUse
     }
 
+    @Dependency(\.toastController) var toast
+
     let workspacePool: WorkspacePool
 
     let serviceLocator: ServiceLocatorType
@@ -49,6 +53,16 @@ public final class GitHubCopilotExtension: BuiltinExtension {
                 let content = try String(contentsOf: documentURL, encoding: .utf8)
                 guard let service = await serviceLocator.getService(from: workspace) else { return }
                 try await service.notifyOpenTextDocument(fileURL: documentURL, content: content)
+            } catch let error as ServerError {
+                let e = GitHubCopilotError.languageServerError(error)
+                Logger.gitHubCopilot.error(e.localizedDescription)
+                
+                switch error {
+                case .serverUnavailable, .serverError:
+                    toast.toast(content: e.localizedDescription, type: .error, duration: 10.0)
+                default:
+                    break
+                }
             } catch {
                 Logger.gitHubCopilot.error(error.localizedDescription)
             }
@@ -295,7 +309,7 @@ extension GitHubCopilotExtension {
             var id: String
             var capabilities: Capability
         }
-        
+
         struct Body: Decodable {
             var data: [Model]
         }

Tool/Sources/GitHubCopilotService/GitHubCopilotWorkspacePlugin.swift

@@ -1,8 +1,8 @@
+import Dependencies
 import Foundation
 import Logger
-import Workspace
 import Toast
-import Dependencies
+import Workspace
 
 public final class GitHubCopilotWorkspacePlugin: WorkspacePlugin {
     enum Error: Swift.Error, LocalizedError {
@@ -14,7 +14,7 @@ public final class GitHubCopilotWorkspacePlugin: WorkspacePlugin {
             }
         }
     }
-    
+
     @Dependency(\.toast) var toast
 
     let installationManager = GitHubCopilotInstallationManager()
@@ -32,6 +32,10 @@ public final class GitHubCopilotWorkspacePlugin: WorkspacePlugin {
             return nil
         } catch {
             Logger.gitHubCopilot.error("Failed to create GitHub Copilot service: \(error)")
+            toast(
+                "Failed to start GitHub Copilot language server: \(error.localizedDescription)",
+                .error
+            )
             return nil
         }
     }
@@ -74,7 +78,7 @@ public final class GitHubCopilotWorkspacePlugin: WorkspacePlugin {
             }
         }
     }
-    
+
     @GitHubCopilotSuggestionActor
     func updateLanguageServerIfPossible() async {
         guard !GitHubCopilotInstallationManager.isInstalling else { return }

Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotInstallationManager.swift

@@ -6,15 +6,15 @@ public struct GitHubCopilotInstallationManager {
     public private(set) static var isInstalling = false
 
     static var downloadURL: URL {
-        let commitHash = "18f485d892b56b311fd752039d6977333ebc2a0f"
+        let commitHash = "f89e977c87180519ba3b942200e3d05b17b1e2fc"
         let link = "https://github.com/github/copilot.vim/archive/\(commitHash).zip"
         return URL(string: link)!
     }
 
     /// The GitHub's version has quite a lot of changes about `watchedFiles` since the following
     /// commit.
     /// https://github.com/github/CopilotForXcode/commit/a50045aa3ab3b7d532cadf40c4c10bed32f81169#diff-678798cf677bcd1ce276809cfccd33da9ff594b1b0c557180210a4ed2bd27ffa
-    static let latestSupportedVersion = "1.48.0"
+    static let latestSupportedVersion = "1.57.0"
     static let minimumSupportedVersion = "1.32.0"
 
     public init() {}
@@ -151,7 +151,15 @@ public struct GitHubCopilotInstallationManager {
                         return
                     }
 
-                    let lspURL = gitFolderURL.appendingPathComponent("dist")
+                    let lspURL = {
+                        let caseA = gitFolderURL.appendingPathComponent("dist")
+                        if FileManager.default.fileExists(atPath: caseA.path) {
+                            return caseA
+                        }
+                        return gitFolderURL
+                            .appendingPathComponent("copilot-language-server")
+                            .appendingPathComponent("dist")
+                    }()
                     let copilotURL = urls.executableURL.appendingPathComponent("copilot")
 
                     if !FileManager.default.fileExists(atPath: copilotURL.path) {

Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift

@@ -83,7 +83,7 @@ enum GitHubCopilotError: Error, LocalizedError {
             case let .clientDataUnavailable(error):
                 return "Language server error: Client data unavailable: \(error)"
             case .serverUnavailable:
-                return "Language server error: Server unavailable, please make sure that:\n1. The path to node is correctly set.\n2. The node is not a shim executable.\n3. the node version is high enough."
+                return "Language server error: Server unavailable, please make sure that:\n1. The path to node is correctly set.\n2. The node is not a shim executable.\n3. the node version is high enough (v22.0+)."
             case .missingExpectedParameter:
                 return "Language server error: Missing expected parameter"
             case .missingExpectedResult:
@@ -523,11 +523,23 @@ public final class GitHubCopilotService: GitHubCopilotBaseService,
         // And sometimes the language server's content was not up to date and may generate
         // weird result when the cursor position exceeds the line.
         let task = Task { @GitHubCopilotSuggestionActor in
-            try await notifyChangeTextDocument(
-                fileURL: fileURL,
-                content: content,
-                version: 1
-            )
+            do {
+                try await notifyChangeTextDocument(
+                    fileURL: fileURL,
+                    content: content,
+                    version: 1
+                )
+            } catch let error as ServerError {
+                switch error {
+                case .serverUnavailable:
+                    throw SuggestionServiceError
+                        .notice(GitHubCopilotError.languageServerError(error))
+                default:
+                    throw error
+                }
+            } catch {
+                throw error
+            }
 
             do {
                 try Task.checkCancellation()