language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix mbe::Shift::new not accounting for non-ident token ids

Browse source
This commit is contained in:
Lukas Wirth 2021-11-22 18:00:32 +01:00
parent 0bc3003960
commit a9c4c6da4c
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/mbe/src/lib.rs
View file

@ -120,12 +120,15 @@ impl Shift {
_ => tree_id,
}
}
tt::TokenTree::Leaf(tt::Leaf::Ident(ident))
if ident.id != tt::TokenId::unspecified() =>
{
Some(ident.id.0)
tt::TokenTree::Leaf(leaf) => {
let id = match leaf {
tt::Leaf::Literal(it) => it.id,
tt::Leaf::Punct(it) => it.id,
tt::Leaf::Ident(it) => it.id,
};
(id != tt::TokenId::unspecified()).then(|| id.0)
}
_ => None,
})
.max()
}