Skip to content

server: handle errors from handlers by converting to a lsp err response #1005

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

Merged
kodiakhq merged 3 commits into from
Mar 16, 2026
Merged

server: handle errors from handlers by converting to a lsp err response #1005

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
609f656
server: handle errors from handlers by converting to a lsp err response
sbdchd Mar 16, 2026
b3e62c7
more cleanup
sbdchd Mar 16, 2026
27b3f0b
change error
sbdchd Mar 16, 2026
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
20 changes: 12 additions & 8 deletions crates/squawk_server/src/dispatch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ impl<'a> RequestDispatcher<'a> {
match req.extract(R::METHOD) {
Ok((id, params)) => Some((id, params)),
Err(err) => {
let response = lsp_server::Response::new_err(
let response = Response::new_err(
id,
lsp_server::ErrorCode::InvalidParams as i32,
lsp_server::ErrorCode::ParseError as i32,
err.to_string(),
);
if let Err(err) = self.connection.sender.send(Message::Response(response)) {
Expand All @@ -57,12 +57,16 @@ impl<'a> RequestDispatcher<'a> {
R: LspRequest,
{
if let Some((id, params)) = self.parse::<R>() {
// TODO: we probably need to send an error here
let result = handler(self.system, params)?;
let resp = Response {
id,
result: Some(serde_json::to_value(result)?),
error: None,
let resp = match handler(self.system, params) {
Ok(result) => Response::new_ok(id, result),
Err(err) => {
error!("Request handler failed: {err}");
Response::new_err(
id,
lsp_server::ErrorCode::InternalError as i32,
err.to_string(),
)
}
};
self.connection.sender.send(Message::Response(resp))?;
}
Expand Down
Loading