Skip to content

Commit

Permalink
Merge pull request #195 from Rutherther/correct-shutdown
Browse files Browse the repository at this point in the history
Shutdown the server on `shutdown` request using `connection.handle_shutdown`.
  • Loading branch information
kraigher committed Sep 9, 2023
2 parents 6681f48 + a1eef68 commit 3d64905
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions vhdl_ls/src/stdio_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,18 @@ impl ConnectionRpcChannel {
while let Ok(message) = self.connection.receiver.recv() {
trace!("Received message: {:?}", message);
match message {
lsp_server::Message::Request(request) => self.handle_request(&mut server, request),
lsp_server::Message::Request(request) => {
match self.connection.handle_shutdown(&request) {
Ok(shutdown) => {
if shutdown {
server.shutdown_server();
} else {
self.handle_request(&mut server, request)
}
}
Err(err) => panic!("{err:?}"),
}
}
lsp_server::Message::Notification(notification) => {
self.handle_notification(&mut server, notification);
}
Expand Down Expand Up @@ -195,14 +206,6 @@ impl ConnectionRpcChannel {
}
Err(request) => request,
};
let request = match extract::<request::Shutdown>(request) {
Ok((id, _params)) => {
server.shutdown_server();
self.send_response(lsp_server::Response::new_ok(id, ()));
return;
}
Err(request) => request,
};

debug!("Unhandled request: {:?}", request);
self.send_response(lsp_server::Response::new_err(
Expand Down

0 comments on commit 3d64905

Please sign in to comment.