Skip to content

Allow QueueBasedMessageHandler.handle to return any Error instead of ResponseError #2416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahoppen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow QueueBasedMessageHandler.handle to return any Error instead of ResponseError #2416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/BuildServerIntegration/BuildServerManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ package actor BuildServerManager: QueueBasedMessageHandler {
package func handle<Request: RequestType>(
request: Request,
id: RequestID,
reply: @Sendable @escaping (LSPResult<Request.Response>) -> Void
reply: @Sendable @escaping (Result<Request.Response, any Error>) -> Void
) async {
let request = RequestAndReply(request, reply: reply)
switch request {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BuildServerIntegration/BuiltInBuildServerAdapter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ actor BuiltInBuildServerAdapter: QueueBasedMessageHandler {
func handle<Request: RequestType>(
request: Request,
id: RequestID,
reply: @Sendable @escaping (LSPResult<Request.Response>) -> Void
reply: @Sendable @escaping (Result<Request.Response, any Error>) -> Void
) async {
let request = RequestAndReply(request, reply: reply)
await buildServerHooks.preHandleRequest?(request.params)
Expand Down
4 changes: 2 additions & 2 deletions Sources/SourceKitLSP/SourceKitLSPServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ extension SourceKitLSPServer: QueueBasedMessageHandler {
continue
}
logger.info("Implicitly cancelling request \(requestID)")
self.messageHandlingHelper.cancelRequest(id: requestID)
self.messageHandlingHelper.cancelRequest(id: requestID, error: .cancelled)
}
}

Expand Down Expand Up @@ -722,7 +722,7 @@ extension SourceKitLSPServer: QueueBasedMessageHandler {
package func handle<Request: RequestType>(
request params: Request,
id: RequestID,
reply: @Sendable @escaping (LSPResult<Request.Response>) -> Void
reply: @Sendable @escaping (Result<Request.Response, any Error>) -> Void
) async {
defer {
if let request = params as? any TextDocumentRequest {
Expand Down