From 72bba9882889b2e20fd91e3c6c3a97debbbe6543 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Sat, 18 Apr 2020 19:29:04 +0800
Subject: [PATCH] Merge empty delim subtree in proc-macro
---
crates/ra_proc_macro_srv/src/rustc_server.rs | 11 ++++++++++-
.../src/tests/fixtures/test_serialize_proc_macro.txt | 3 +--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/crates/ra_proc_macro_srv/src/rustc_server.rs b/crates/ra_proc_macro_srv/src/rustc_server.rs
index ec0d356922d..9fcfdc4504c 100644
--- a/crates/ra_proc_macro_srv/src/rustc_server.rs
+++ b/crates/ra_proc_macro_srv/src/rustc_server.rs
@@ -76,7 +76,16 @@ impl Extend<TokenTree> for TokenStream {
impl Extend<TokenStream> for TokenStream {
fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
for item in streams {
- self.subtree.token_trees.extend(&mut item.into_iter())
+ for tkn in item {
+ match tkn {
+ tt::TokenTree::Subtree(subtree) if subtree.delimiter.is_none() => {
+ self.subtree.token_trees.extend(subtree.token_trees);
+ }
+ _ => {
+ self.subtree.token_trees.push(tkn);
+ }
+ }
+ }
}
}
}
diff --git a/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt b/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
index 24507d98d76..1f5d940fa0b 100644
--- a/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
+++ b/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
@@ -25,8 +25,7 @@ SUBTREE $
SUBTREE () 4294967295
IDENT feature 4294967295
PUNCH = [alone] 4294967295
- SUBTREE $
- LITERAL "cargo-clippy" 0
+ LITERAL "cargo-clippy" 0
PUNCH , [alone] 4294967295
IDENT allow 4294967295
SUBTREE () 4294967295