Send empty result for requests without response

All requests need to respond, otherwise it is a notification, not a request
ChimeHQ · Nov 3, 2023 · 57d5c87 · 57d5c87
1 parent c4954f7
commit 57d5c87
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/Sources/LSPClient/Client.ServerConnection.swift b/Sources/LSPClient/Client.ServerConnection.swift
@@ -29,7 +29,7 @@ public extension ServerConnection {
 	}
 
 	func shutdown() async throws {
-		try await sendRequestWithErrorOnlyResult(.shutdown)
+		try await sendRequestWithErrorOnlyResult(.shutdown(ClientRequest.NullHandler))
 	}
 
 	func exit() async throws {
@@ -188,7 +188,7 @@ public extension ServerConnection {
 // Workspace Requests
 public extension ServerConnection {
 	func inlayHintRefresh() async throws {
-		try await sendRequestWithErrorOnlyResult(.workspaceInlayHintRefresh)
+		try await sendRequestWithErrorOnlyResult(.workspaceInlayHintRefresh(ClientRequest.NullHandler))
 	}
 
     func willCreateFiles(params: CreateFilesParams) async throws -> WorkspaceWillCreateFilesResponse {

diff --git a/Sources/LSPServer/Server.JSONRPCClientConnection.swift b/Sources/LSPServer/Server.JSONRPCClientConnection.swift
@@ -42,6 +42,10 @@ public actor JSONRPCClientConnection : ClientConnection {
 		eventContinuation.finish()
 	}
 
+	public func stop() {
+		eventContinuation.finish()
+	}
+
 
 	private func decodeNotificationParams<Params>(_ type: Params.Type, from data: Data) throws -> Params where Params : Decodable {
 		let note = try JSONDecoder().decode(JSONRPCNotification<Params>.self, from: data)
@@ -167,9 +171,9 @@ public actor JSONRPCClientConnection : ClientConnection {
 			case .initialize:
 				yield(id: id, request: ClientRequest.initialize(try decodeRequestParams(data), makeHandler(handler)))
 			case .shutdown:
-				yield(id: id, request: ClientRequest.shutdown)
+				yield(id: id, request: ClientRequest.shutdown(makeHandler(handler)))
 			case .workspaceInlayHintRefresh:
-				yield(id: id, request: ClientRequest.workspaceInlayHintRefresh)
+				yield(id: id, request: ClientRequest.workspaceInlayHintRefresh(makeHandler(handler)))
 			case .workspaceExecuteCommand:
 				yield(id: id, request: ClientRequest.workspaceExecuteCommand(try decodeRequestParams(data), makeHandler(handler)))
 			case .workspaceWillCreateFiles:

diff --git a/Sources/LSPServer/Server.RequestHandler.swift b/Sources/LSPServer/Server.RequestHandler.swift
@@ -67,10 +67,12 @@ public extension RequestHandler {
 		switch request {
 		case let .initialize(params, handler):
 			await handler(await initialize(id: id, params: params))
-		case .shutdown:
+		case let .shutdown(handler):
 			await shutdown(id: id)
-		case .workspaceInlayHintRefresh:
+			await handler(.success(nil))
+		case let .workspaceInlayHintRefresh(handler):
 			await workspaceInlayHintRefresh(id: id)
+			await handler(.success(nil))
 		case let .workspaceExecuteCommand(params, handler):
 			await handler(await workspaceExecuteCommand(id: id, params: params))
 		case let .workspaceWillCreateFiles(params, handler):

diff --git a/Sources/LanguageServerProtocol/LanguageServerProtocol.swift b/Sources/LanguageServerProtocol/LanguageServerProtocol.swift
@@ -122,6 +122,7 @@ public enum ClientRequest: Sendable {
 		// throw NullHandlerError.notImplemented(result)
 	}
 
+
 	public enum Method: String {
         case initialize
         case shutdown
@@ -175,9 +176,9 @@ public enum ClientRequest: Sendable {
     }
 
 	case initialize(InitializeParams, Handler<InitializationResponse>)
-	case shutdown
+	case shutdown(Handler<LSPAny?>)
 	case workspaceExecuteCommand(ExecuteCommandParams, Handler<LSPAny?>)
-	case workspaceInlayHintRefresh
+	case workspaceInlayHintRefresh(Handler<LSPAny?>)
 	case workspaceWillCreateFiles(CreateFilesParams, Handler<WorkspaceEdit?>)
 	case workspaceWillRenameFiles(RenameFilesParams, Handler<WorkspaceEdit?>)
 	case workspaceWillDeleteFiles(DeleteFilesParams, Handler<WorkspaceEdit?>)
@@ -367,6 +368,7 @@ public enum ServerNotification: Sendable, Hashable {
 
 public enum ServerRequest: Sendable {
 	public typealias Handler<T: Sendable & Encodable> = @Sendable (Result<T, AnyJSONRPCResponseError>) async -> Void
+	public typealias VoidHandler = @Sendable () async -> Void
 	public typealias ErrorOnlyHandler = @Sendable (AnyJSONRPCResponseError?) async -> Void
 
     public enum Method: String {