1 files changed, 32 insertions, 6 deletions

diff --git a/crates/ra_mbe/src/mbe_parser.rs b/crates/ra_mbe/src/mbe_parser.rs
index c7ab463e2..797c70bc7 100644
--- a/crates/ra_mbe/src/mbe_parser.rs
+++ b/crates/ra_mbe/src/mbe_parser.rs
@@ -28,17 +28,31 @@ fn parse_rule(p: &mut TtCursor) -> Result<crate::Rule, ParseError> {
     Ok(crate::Rule { lhs, rhs })
 }
 
+fn is_boolean_literal(lit: Option<&tt::TokenTree>) -> bool {
+    if let Some(tt::TokenTree::Leaf(tt::Leaf::Literal(lit))) = lit {
+        if lit.text == "true" || lit.text == "false" {
+            return true;
+        }
+    }
+
+    false
+}
+
 fn parse_subtree(tt: &tt::Subtree, transcriber: bool) -> Result<crate::Subtree, ParseError> {
     let mut token_trees = Vec::new();
     let mut p = TtCursor::new(tt);
     while let Some(tt) = p.eat() {
         let child: crate::TokenTree = match tt {
             tt::TokenTree::Leaf(leaf) => match leaf {
-                tt::Leaf::Punct(tt::Punct { char: '$', .. }) => {
-                    if p.at_ident().is_some() {
+                tt::Leaf::Punct(tt::Punct { char: '$', spacing }) => {
+                    // mbe var can be an ident or keyword, including `true` and `false`
+                    if p.at_ident().is_some() || is_boolean_literal(p.current()) {
                         crate::Leaf::from(parse_var(&mut p, transcriber)?).into()
-                    } else {
+                    } else if let Some(tt::TokenTree::Subtree(_)) = p.current() {
                         parse_repeat(&mut p, transcriber)?.into()
+                    } else {
+                        // Treat it as normal punct
+                        crate::Leaf::from(tt::Punct { char: '$', spacing: *spacing }).into()
                     }
                 }
                 tt::Leaf::Punct(punct) => crate::Leaf::from(*punct).into(),
@@ -57,8 +71,16 @@ fn parse_subtree(tt: &tt::Subtree, transcriber: bool) -> Result<crate::Subtree,
 }
 
 fn parse_var(p: &mut TtCursor, transcriber: bool) -> Result<crate::Var, ParseError> {
-    let ident = p.eat_ident().unwrap();
-    let text = ident.text.clone();
+    let text = {
+        if is_boolean_literal(p.current()) {
+            let lit = p.eat_literal().unwrap();
+            lit.text.clone()
+        } else {
+            let ident = p.eat_ident().unwrap();
+            ident.text.clone()
+        }
+    };
+
     let kind = if !transcriber && p.at_char(':') {
         p.bump();
         if let Some(ident) = p.eat_ident() {
@@ -89,7 +111,7 @@ fn mk_repeat(
 }
 
 fn parse_repeat(p: &mut TtCursor, transcriber: bool) -> Result<crate::Repeat, ParseError> {
-    let subtree = p.eat_subtree().unwrap();
+    let subtree = p.eat_subtree()?;
     let mut subtree = parse_subtree(subtree, transcriber)?;
     subtree.delimiter = crate::Delimiter::None;
 
@@ -121,6 +143,10 @@ mod tests {
         expect_err("invalid", "subtree");
 
         is_valid("($i:ident) => ()");
+        is_valid("($($i:ident)*) => ($_)");
+        is_valid("($($true:ident)*) => ($true)");
+        is_valid("($($false:ident)*) => ($false)");
+
         expect_err("$i:ident => ()", "subtree");
         expect_err("($i:ident) ()", "`=`");
         expect_err("($($i:ident)_) => ()", "repeat");