itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-12-27 16:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix proc-macro-srv passing invalid extra none group to proc-macros

Browse Source
This commit is contained in:
Lukas Wirth 2025-12-01 16:28:18 +01:00
parent d690155841
commit 5ca77bd0bc
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/proc-macro-api/src/legacy_protocol/msg/flat.rs
View File

@ -962,8 +962,6 @@ impl<T: SpanTransformer> Reader<'_, T> {
};
res[i] = Some(g);
}
proc_macro_srv::TokenStream::new(vec![proc_macro_srv::TokenTree::Group(
res[0].take().unwrap(),
)])
res[0].take().unwrap().stream.unwrap_or_default()
}
}

18
crates/proc-macro-srv/src/tests/mod.rs
View File

@ -297,26 +297,38 @@ fn test_fn_like_macro_noop() {
fn test_fn_like_macro_clone_ident_subtree() {
assert_expand(
"fn_like_clone_tokens",
r#"ident, []"#,
r#"ident, [ident2, ident3]"#,
expect![[r#"
IDENT 1 ident
PUNCT 1 , [alone]
GROUP [] 1 1 1
IDENT 1 ident2
PUNCT 1 , [alone]
IDENT 1 ident3
IDENT 1 ident
PUNCT 1 , [alone]
GROUP [] 1 1 1
IDENT 1 ident2
PUNCT 1 , [alone]
IDENT 1 ident3
"#]],
expect![[r#"
IDENT 42:Root[0000, 0]@0..5#ROOT2024 ident
PUNCT 42:Root[0000, 0]@5..6#ROOT2024 , [alone]
GROUP [] 42:Root[0000, 0]@7..8#ROOT2024 42:Root[0000, 0]@8..9#ROOT2024 42:Root[0000, 0]@7..9#ROOT2024
GROUP [] 42:Root[0000, 0]@7..8#ROOT2024 42:Root[0000, 0]@22..23#ROOT2024 42:Root[0000, 0]@7..23#ROOT2024
IDENT 42:Root[0000, 0]@8..14#ROOT2024 ident2
PUNCT 42:Root[0000, 0]@14..15#ROOT2024 , [alone]
IDENT 42:Root[0000, 0]@16..22#ROOT2024 ident3
IDENT 42:Root[0000, 0]@0..5#ROOT2024 ident
PUNCT 42:Root[0000, 0]@5..6#ROOT2024 , [alone]
GROUP [] 42:Root[0000, 0]@7..9#ROOT2024 42:Root[0000, 0]@7..9#ROOT2024 42:Root[0000, 0]@7..9#ROOT2024
GROUP [] 42:Root[0000, 0]@7..23#ROOT2024 42:Root[0000, 0]@7..23#ROOT2024 42:Root[0000, 0]@7..23#ROOT2024
IDENT 42:Root[0000, 0]@8..14#ROOT2024 ident2
PUNCT 42:Root[0000, 0]@14..15#ROOT2024 , [alone]
IDENT 42:Root[0000, 0]@16..22#ROOT2024 ident3
"#]],
);
}