nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #13915 - Veykril:lsp-server-msg, r=Veykril

Browse Source 
Make it clearer when the server expects an initialized notification
This commit is contained in:
bors 2023-01-09 16:04:04 +00:00
commit f32e20edb9
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/lsp-server/src/lib.rs
View File

@ -114,10 +114,8 @@ impl Connection {
/// ```
pub fn initialize_start(&self) -> Result<(RequestId, serde_json::Value), ProtocolError> {
loop {
match self.receiver.recv() {
Ok(Message::Request(req)) if req.is_initialize() => {
return Ok((req.id, req.params))
}
break match self.receiver.recv() {
Ok(Message::Request(req)) if req.is_initialize() => Ok((req.id, req.params)),
// Respond to non-initialize requests with ServerNotInitialized
Ok(Message::Request(req)) => {
let resp = Response::new_err(
@ -126,14 +124,11 @@ impl Connection {
format!("expected initialize request, got {req:?}"),
);
self.sender.send(resp.into()).unwrap();
continue;
}
Ok(msg) => {
return Err(ProtocolError(format!("expected initialize request, got {msg:?}")))
}
Ok(msg) => Err(ProtocolError(format!("expected initialize request, got {msg:?}"))),
Err(e) => {
return Err(ProtocolError(format!(
"expected initialize request, got error: {e}"
)))
Err(ProtocolError(format!("expected initialize request, got error: {e}")))
}
};
}
@ -148,17 +143,14 @@ impl Connection {
let resp = Response::new_ok(initialize_id, initialize_result);
self.sender.send(resp.into()).unwrap();
match &self.receiver.recv() {
Ok(Message::Notification(n)) if n.is_initialized() => (),
Ok(Message::Notification(n)) if n.is_initialized() => Ok(()),
Ok(msg) => {
return Err(ProtocolError(format!("expected Message::Notification, got: {msg:?}",)))
Err(ProtocolError(format!(r#"expected initialized notification, got: {msg:?}"#)))
}
Err(e) => {
return Err(ProtocolError(format!(
"expected initialized notification, got error: {e}",
)))
Err(ProtocolError(format!("expected initialized notification, got error: {e}",)))
}
}
Ok(())
}
/// Initialize the connection. Sends the server capabilities