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

add tt matcher

Browse source
This commit is contained in:
Edwin Cheng 2019-04-19 19:41:59 +08:00
parent 762819864f
commit 59b6cc780b
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ra_mbe/src/lib.rs
View file

@ -762,4 +762,28 @@ MACRO_ITEMS@[0; 40)
r#"# [cfg (target_os = "windows")] fn bar () {}"#, r#"# [cfg (target_os = "windows")] fn bar () {}"#,
); );
} }
#[test]
fn test_tt_block() {
let rules = create_rules(
r#"
macro_rules! foo {
($ i:tt) => { fn foo() $ i }
}
"#,
);
assert_expansion(&rules, r#"foo! { { 1; } }"#, r#"fn foo () {1 ;}"#);
}
#[test]
fn test_tt_group() {
let rules = create_rules(
r#"
macro_rules! foo {
($($ i:tt)*) => { $($ i)* }
}
"#,
);
assert_expansion(&rules, r#"foo! { fn foo() {} }"#, r#"fn foo () {}"#);
}
} }

4
crates/ra_mbe/src/mbe_expander.rs
View file

@ -171,6 +171,10 @@ fn match_lhs(pattern: &crate::Subtree, input: &mut TtCursor) -> Result<Bindings,
input.eat_meta().ok_or(ExpandError::UnexpectedToken)?.clone(); input.eat_meta().ok_or(ExpandError::UnexpectedToken)?.clone();
res.inner.insert(text.clone(), Binding::Simple(meta.into())); res.inner.insert(text.clone(), Binding::Simple(meta.into()));
} }
"tt" => {
let token = input.eat().ok_or(ExpandError::UnexpectedToken)?.clone();
res.inner.insert(text.clone(), Binding::Simple(token.into()));
}
"item" => { "item" => {
let item = let item =
input.eat_item().ok_or(ExpandError::UnexpectedToken)?.clone(); input.eat_item().ok_or(ExpandError::UnexpectedToken)?.clone();