3 files changed, 56 insertions, 16 deletions

diff --git a/crates/proc_macro_api/src/msg.rs b/crates/proc_macro_api/src/msg.rs
index 970f165ed..f525df152 100644
--- a/crates/proc_macro_api/src/msg.rs
+++ b/crates/proc_macro_api/src/msg.rs
@@ -55,8 +55,8 @@ pub enum ErrorCode {
 }
 
 pub trait Message: Serialize + DeserializeOwned {
-    fn read(inp: &mut impl BufRead) -> io::Result<Option<Self>> {
-        Ok(match read_json(inp)? {
+    fn read(inp: &mut impl BufRead, buf: &mut String) -> io::Result<Option<Self>> {
+        Ok(match read_json(inp, buf)? {
             None => None,
             Some(text) => {
                 let mut deserializer = serde_json::Deserializer::from_str(&text);
@@ -76,14 +76,29 @@ pub trait Message: Serialize + DeserializeOwned {
 impl Message for Request {}
 impl Message for Response {}
 
-fn read_json(inp: &mut impl BufRead) -> io::Result<Option<String>> {
-    let mut buf = String::new();
-    inp.read_line(&mut buf)?;
-    buf.pop(); // Remove trailing '\n'
-    Ok(match buf.len() {
-        0 => None,
-        _ => Some(buf),
-    })
+fn read_json<'a>(
+    inp: &mut impl BufRead,
+    mut buf: &'a mut String,
+) -> io::Result<Option<&'a String>> {
+    loop {
+        buf.clear();
+
+        inp.read_line(&mut buf)?;
+        buf.pop(); // Remove trailing '\n'
+
+        if buf.is_empty() {
+            return Ok(None);
+        }
+
+        // Some ill behaved macro try to use stdout for debugging
+        // We ignore it here
+        if !buf.starts_with("{") {
+            log::error!("proc-macro tried to print : {}", buf);
+            continue;
+        }
+
+        return Ok(Some(buf));
+    }
 }
 
 fn write_json(out: &mut impl Write, msg: &str) -> io::Result<()> {
diff --git a/crates/proc_macro_api/src/process.rs b/crates/proc_macro_api/src/process.rs
index 30bb1b687..99d05aef3 100644
--- a/crates/proc_macro_api/src/process.rs
+++ b/crates/proc_macro_api/src/process.rs
@@ -90,8 +90,10 @@ impl ProcMacroProcessSrv {
 fn client_loop(task_rx: Receiver<Task>, mut process: Process) {
     let (mut stdin, mut stdout) = process.stdio().expect("couldn't access child stdio");
 
+    let mut buf = String::new();
+
     for Task { req, result_tx } in task_rx {
-        match send_request(&mut stdin, &mut stdout, req) {
+        match send_request(&mut stdin, &mut stdout, req, &mut buf) {
             Ok(res) => result_tx.send(res).unwrap(),
             Err(err) => {
                 log::error!(
@@ -152,7 +154,8 @@ fn send_request(
     mut writer: &mut impl Write,
     mut reader: &mut impl BufRead,
     req: Request,
+    buf: &mut String,
 ) -> io::Result<Option<Response>> {
     req.write(&mut writer)?;
-    Response::read(&mut reader)
+    Response::read(&mut reader, buf)
 }
diff --git a/crates/proc_macro_api/src/rpc.rs b/crates/proc_macro_api/src/rpc.rs
index 9a68e2cc5..8f7270afe 100644
--- a/crates/proc_macro_api/src/rpc.rs
+++ b/crates/proc_macro_api/src/rpc.rs
@@ -77,7 +77,11 @@ struct TokenIdDef(u32);
 #[derive(Serialize, Deserialize)]
 #[serde(remote = "Delimiter")]
 struct DelimiterDef {
-    #[serde(with = "TokenIdDef")]
+    #[serde(
+        with = "TokenIdDef",
+        default = "tt::TokenId::unspecified",
+        skip_serializing_if = "token_id_def::skip_if"
+    )]
     id: TokenId,
     #[serde(with = "DelimiterKindDef")]
     kind: DelimiterKind,
@@ -116,7 +120,11 @@ enum LeafDef {
 #[serde(remote = "Literal")]
 struct LiteralDef {
     text: SmolStr,
-    #[serde(with = "TokenIdDef")]
+    #[serde(
+        with = "TokenIdDef",
+        default = "tt::TokenId::unspecified",
+        skip_serializing_if = "token_id_def::skip_if"
+    )]
     id: TokenId,
 }
 
@@ -126,7 +134,11 @@ struct PunctDef {
     char: char,
     #[serde(with = "SpacingDef")]
     spacing: Spacing,
-    #[serde(with = "TokenIdDef")]
+    #[serde(
+        with = "TokenIdDef",
+        default = "tt::TokenId::unspecified",
+        skip_serializing_if = "token_id_def::skip_if"
+    )]
     id: TokenId,
 }
 
@@ -141,10 +153,20 @@ enum SpacingDef {
 #[serde(remote = "Ident")]
 struct IdentDef {
     text: SmolStr,
-    #[serde(with = "TokenIdDef")]
+    #[serde(
+        with = "TokenIdDef",
+        default = "tt::TokenId::unspecified",
+        skip_serializing_if = "token_id_def::skip_if"
+    )]
     id: TokenId,
 }
 
+mod token_id_def {
+    pub(super) fn skip_if(value: &tt::TokenId) -> bool {
+        *value == tt::TokenId::unspecified()
+    }
+}
+
 mod opt_delimiter_def {
     use super::{Delimiter, DelimiterDef};
     use serde::{Deserialize, Deserializer, Serialize, Serializer};