Merge branch 'feature/github-copilot-1.9.1' into develop

Author: intitni

Core/Sources/GitHubCopilotService/CopilotLocalProcessServer.swift

@@ -222,6 +222,13 @@ extension CustomJSONRPCLanguageServer {
             }
             block(nil)
             return true
+        case "featureFlagsNotification":
+            if UserDefaults.shared.value(for: \.gitHubCopilotVerboseLog) {
+                Logger.gitHubCopilot
+                    .info("\(anyNotification.method): \(anyNotification.params.debugDescription)")
+            }
+            block(nil)
+            return true
         default:
             return false
         }

Core/Sources/GitHubCopilotService/GitHubCopilotInstallationManager.swift

@@ -5,12 +5,12 @@ public struct GitHubCopilotInstallationManager {
     private static var isInstalling = false
 
     static var downloadURL: URL {
-        let commitHash = "1358e8e45ecedc53daf971924a0541ddf6224faf"
+        let commitHash = "a4a6d6b3f9e284e7f5c849619e06cd228cad8abd"
         let link = "https://github.com/github/copilot.vim/archive/\(commitHash).zip"
         return URL(string: link)!
     }
 
-    static let latestSupportedVersion = "1.8.4"
+    static let latestSupportedVersion = "1.9.1"
 
     public init() {}
 
@@ -113,7 +113,7 @@ public struct GitHubCopilotInstallationManager {
                         includingPropertiesForKeys: nil,
                         options: []
                     )
-                    
+
                     defer {
                         for url in contentURLs {
                             try? FileManager.default.removeItem(at: url)
@@ -127,8 +127,18 @@ public struct GitHubCopilotInstallationManager {
                         return
                     }
 
-                    let lspURL = gitFolderURL.appendingPathComponent("copilot")
-                    let installationURL = urls.executableURL.appendingPathComponent("copilot")
+                    let lspURL = gitFolderURL.appendingPathComponent("dist")
+                    let copilotURL = urls.executableURL.appendingPathComponent("copilot")
+
+                    if !FileManager.default.fileExists(atPath: copilotURL.path) {
+                        try FileManager.default.createDirectory(
+                            at: copilotURL,
+                            withIntermediateDirectories: true,
+                            attributes: nil
+                        )
+                    }
+
+                    let installationURL = copilotURL.appendingPathComponent("dist")
                     try FileManager.default.copyItem(at: lspURL, to: installationURL)
 
                     // update permission 755

Core/Sources/GitHubCopilotService/GitHubCopilotService.swift

@@ -165,13 +165,11 @@ public class GitHubCopilotBaseService {
 
         self.server = server
         localProcessServer = localServer
-        
+
         Task {
             try await server.sendRequest(GitHubCopilotRequest.SetEditorInfo())
         }
     }
-    
-    
 
     public static func createFoldersIfNeeded() throws -> (
         applicationSupportURL: URL,
@@ -314,6 +312,18 @@ public final class GitHubCopilotSuggestionService: GitHubCopilotBaseService,
                     }
                     return true
                 }
+                .map {
+                    if UserDefaults.shared.value(for: \.gitHubCopilotIgnoreTrailingNewLines) {
+                        var updated = $0
+                        var text = updated.text[...]
+                        while text.hasSuffix("\n") {
+                            text = text.dropLast(1)
+                        }
+                        updated.text = String(text)
+                        return updated
+                    }
+                    return $0
+                }
             try Task.checkCancellation()
             return completions
         }

Core/Sources/HostApp/AccountSettings/CopilotView.swift

@@ -18,7 +18,8 @@ struct CopilotView: View {
         @AppStorage(\.gitHubCopilotProxyUsername) var gitHubCopilotProxyUsername
         @AppStorage(\.gitHubCopilotProxyPassword) var gitHubCopilotProxyPassword
         @AppStorage(\.gitHubCopilotUseStrictSSL) var gitHubCopilotUseStrictSSL
-
+        @AppStorage(\.gitHubCopilotIgnoreTrailingNewLines)
+        var gitHubCopilotIgnoreTrailingNewLines
         init() {}
     }
 
@@ -229,13 +230,20 @@ struct CopilotView: View {
                 Divider()
 
                 Form {
+                    Toggle(
+                        "Ignore Trailing New Lines",
+                        isOn: $settings.gitHubCopilotIgnoreTrailingNewLines
+                    )
                     Toggle("Verbose Log", isOn: $settings.gitHubCopilotVerboseLog)
                 }
 
                 Divider()
 
                 Form {
-                    TextField(text: $settings.gitHubCopilotProxyHost, prompt: Text("xxx.xxx.xxx.xxx, leave it blank to disable proxy.")) {
+                    TextField(
+                        text: $settings.gitHubCopilotProxyHost,
+                        prompt: Text("xxx.xxx.xxx.xxx, leave it blank to disable proxy.")
+                    ) {
                         Text("Proxy Host")
                     }
                     TextField(text: $settings.gitHubCopilotProxyPort, prompt: Text("80")) {

Tool/Sources/Preferences/Keys.swift

@@ -160,6 +160,10 @@ public extension UserDefaultPreferenceKeys {
     var runNodeWith: PreferenceKey<NodeRunner> {
         .init(defaultValue: .env, key: "RunNodeWith")
     }
+    
+    var gitHubCopilotIgnoreTrailingNewLines: PreferenceKey<Bool> {
+        .init(defaultValue: false, key: "GitHubCopilotIgnoreTrailingNewLines")
+    }
 }
 
 // MARK: - Codeium Settings