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

Make it clearer when the server expects an initialized notification
arcnmx · Jan 9, 2023 · f32e20e · f32e20e
2 parents fd300ee + 9eb50d3
commit f32e20e
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/lib/lsp-server/src/lib.rs b/lib/lsp-server/src/lib.rs
@@ -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