language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix a bug for single dollar sign macro

Browse source
This commit is contained in:
Edwin Cheng 2020-03-04 01:03:44 +08:00
parent b55d22e060
commit 3dc3d9d18f
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_mbe/src/parser.rs
View file

@ -90,7 +90,11 @@ fn next_op<'a>(
) -> Result<Op<'a>, ExpandError> {
let res = match first {
tt::TokenTree::Leaf(tt::Leaf::Punct(tt::Punct { char: '$', .. })) => {
let second = src.next().ok_or_else(|| err!("bad var 1"))?;
// Note that the '$' itself is a valid token inside macro_rules.
let second = match src.next() {
None => return Ok(Op::TokenTree(first)),
Some(it) => it,
};
match second {
tt::TokenTree::Subtree(subtree) => {
let (separator, kind) = parse_repeat(src)?;