Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 12:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #744

Browse source 
744: mbe: Ensure repetition separator matches r=matklad a=jrmuizel



Co-authored-by: Jeff Muizelaar <jrmuizel@gmail.com>
This commit is contained in:
bors[bot] 2019-02-05 07:28:31 +00:00
commit d914ac0069
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -256,4 +256,28 @@ impl_froms!(TokenTree: Leaf, Subtree);
assert_expansion(&rules, "foo! { eggs Baz }", "struct Baz ;");
}
#[test]
fn test_match_group_pattern_by_separator_token() {
let rules = create_rules(
r#"
macro_rules! foo {
($ ($ i:ident),*) => ($ (
mod $ i {}
)*);
($ ($ i:ident)#*) => ($ (
fn $ i() {}
)*);
($ i:ident ,# $ j:ident) => (
struct $ i;
struct $ j;
)
}
"#,
);
assert_expansion(&rules, "foo! { foo, bar }", "mod foo {} mod bar {}");
assert_expansion(&rules, "foo! { foo# bar }", "fn foo () {} fn bar () {}");
assert_expansion(&rules, "foo! { Foo,# Bar }", "struct Foo ; struct Bar ;");
}
}

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

@ -140,8 +140,12 @@ fn match_lhs(pattern: &crate::Subtree, input: &mut TtCursor) -> Option<Bindings>
}) => {
while let Some(nested) = match_lhs(subtree, input) {
res.push_nested(nested)?;
if separator.is_some() && !input.is_eof() {
input.eat_punct()?;
if let Some(separator) = *separator {
if !input.is_eof() {
if input.eat_punct()?.char != separator {
return None;
}
}
}
}
}