Fix that the GitHub Copilot language server was not terminating when the workspace closed

Author: intitni

Tool/Sources/GitHubCopilotService/GitHubCopilotExtension.swift

@@ -141,7 +141,7 @@ final class ServiceLocator {
         guard let workspace = workspacePool.workspaces[workspace.workspaceURL],
               let plugin = workspace.plugin(for: GitHubCopilotWorkspacePlugin.self)
         else { return nil }
-        return plugin.gitHubCopilotService
+        return await plugin.gitHubCopilotService
     }
 }
 

Tool/Sources/GitHubCopilotService/GitHubCopilotWorkspacePlugin.swift

@@ -3,7 +3,8 @@ import Logger
 import Workspace
 
 public final class GitHubCopilotWorkspacePlugin: WorkspacePlugin {
-    var _gitHubCopilotService: GitHubCopilotService?
+    private var _gitHubCopilotService: GitHubCopilotService?
+    @GitHubCopilotSuggestionActor
     var gitHubCopilotService: GitHubCopilotService? {
         if let service = _gitHubCopilotService { return service }
         do {
@@ -15,21 +16,27 @@ public final class GitHubCopilotWorkspacePlugin: WorkspacePlugin {
     }
 
     deinit {
-        if let gitHubCopilotService {
-            Task { await gitHubCopilotService.terminate() }
+        if let _gitHubCopilotService {
+            Task { await _gitHubCopilotService.terminate() }
         }
     }
 
+    @GitHubCopilotSuggestionActor
     func createGitHubCopilotService() throws -> GitHubCopilotService {
         let newService = try GitHubCopilotService(projectRootURL: projectRootURL)
         _gitHubCopilotService = newService
+        newService.localProcessServer?.terminationHandler = { [weak self] in
+            Logger.gitHubCopilot.error("GitHub Copilot language server terminated")
+            self?.terminate()
+        }
         Task {
             try await Task.sleep(nanoseconds: 1_000_000_000)
             finishLaunchingService()
         }
         return newService
     }
 
+    @GitHubCopilotSuggestionActor
     func finishLaunchingService() {
         guard let workspace, let _gitHubCopilotService else { return }
         Task {

Tool/Sources/GitHubCopilotService/LanguageServer/CopilotLocalProcessServer.swift

@@ -84,6 +84,10 @@ class CopilotLocalProcessServer {
         get { return wrappedServer?.logMessages ?? false }
         set { wrappedServer?.logMessages = newValue }
     }
+    
+    func terminate() {
+        process.terminate()
+    }
 }
 
 extension CopilotLocalProcessServer: LanguageServerProtocol.Server {

Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift

@@ -95,6 +95,10 @@ public class GitHubCopilotBaseService {
     let projectRootURL: URL
     var server: GitHubCopilotLSP
     var localProcessServer: CopilotLocalProcessServer?
+    
+    deinit {
+        localProcessServer?.terminate()
+    }
 
     init(designatedServer: GitHubCopilotLSP) {
         projectRootURL = URL(fileURLWithPath: "/")

Tool/Sources/Workspace/Workspace.swift

@@ -74,7 +74,7 @@ public final class Workspace {
     public let openedFileRecoverableStorage: OpenedFileRecoverableStorage
     public private(set) var lastLastUpdateTime = Environment.now()
     public var isExpired: Bool {
-        Environment.now().timeIntervalSince(lastLastUpdateTime) > 60 * 60 * 1
+        Environment.now().timeIntervalSince(lastLastUpdateTime) > 30 * 60 * 1
     }
 
     public private(set) var filespaces = [URL: Filespace]()