mbe: Add support matching for matching idents

2 files changed, 29 insertions, 0 deletions

diff --git a/crates/ra_mbe/src/lib.rs b/crates/ra_mbe/src/lib.rs
index 6b648e7af..6f719acbf 100644
--- a/crates/ra_mbe/src/lib.rs
+++ b/crates/ra_mbe/src/lib.rs
@@ -232,4 +232,28 @@ impl_froms!(TokenTree: Leaf, Subtree);
         assert_expansion(&rules, "foo! { bar = }", "fn bar () {}");
         assert_expansion(&rules, "foo! { Baz + }", "struct Baz ;");
     }
+
+    #[test]
+    fn test_fail_match_pattern_by_word_token() {
+        let rules = create_rules(
+            r#"
+        macro_rules! foo {
+            ($ i:ident) => (
+                mod $ i {}
+            );
+            (spam $ i:ident) => (
+                fn $ i() {}
+            );
+            (eggs $ i:ident) => (
+                struct $ i;
+            )
+        }
+"#,
+        );
+
+        assert_expansion(&rules, "foo! { foo }", "mod foo {}");
+        assert_expansion(&rules, "foo! { spam bar }", "fn bar () {}");
+        assert_expansion(&rules, "foo! { eggs Baz }", "struct Baz ;");
+    }
+
 }
diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/ra_mbe/src/mbe_expander.rs
index 2945e7359..212e2ea92 100644
--- a/crates/ra_mbe/src/mbe_expander.rs
+++ b/crates/ra_mbe/src/mbe_expander.rs
@@ -126,6 +126,11 @@ fn match_lhs(pattern: &crate::Subtree, input: &mut TtCursor) -> Option<Bindings>
                         return None;
                     }
                 }
+                crate::Leaf::Ident(ident) => {
+                    if input.eat_ident()?.text != ident.text {
+                        return None;
+                    }
+                }
                 _ => return None,
             },
             crate::TokenTree::Repeat(crate::Repeat {