bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/mbe/src/lib.rs')
-rw-r--r--crates/mbe/src/lib.rs13
1 files changed, 8 insertions, 5 deletions
diff --git a/crates/mbe/src/lib.rs b/crates/mbe/src/lib.rs
index 833a67ad99..b58b86b38d 100644
--- a/crates/mbe/src/lib.rs
+++ b/crates/mbe/src/lib.rs
@@ -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()
}