lsp: fix main loop so it blocks while waiting for messages

oysandvik94 · Aug 6, 2024 · c2dd64c · c2dd64c
1 parent ec78647
commit c2dd64c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/son_of_anton/Cargo.toml b/crates/son_of_anton/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+interpreter = { path = "../interpreter/" }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 anyhow = { workspace = true }

diff --git a/crates/son_of_anton/src/main.rs b/crates/son_of_anton/src/main.rs
@@ -18,7 +18,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut anton = SonOfAnton::from(io::stdout());
 
     loop {
-        match process_message(&mut reader, &mut anton) {
+        // Block until there is input to read
+        let mut buffer = String::new();
+        reader.read_line(&mut buffer)?;
+
+        if buffer.trim().is_empty() {
+            continue;
+        }
+
+        match process_message(&mut buffer.as_bytes(), &mut anton) {
             Ok(()) => {
                 continue;
             }

diff --git a/crates/son_of_anton/src/rpc.rs b/crates/son_of_anton/src/rpc.rs
@@ -4,7 +4,7 @@ use tracing::{event, Level};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct BaseMessage {
-    id: u64,
+    id: Option<u64>,
     jsonrpc: String,
 }
 
@@ -63,7 +63,7 @@ mod tests {
             "Content-Length: 40\r\n\r\n{\"id\":1,\"jsonrpc\":\"2.0\",\"result\":\"test\"}";
         let actual = encode_response(Response {
             message: BaseMessage {
-                id: 1,
+                id: Some(1),
                 jsonrpc: "2.0".to_string(),
             },
             result: Some("test".to_string()),