From 53d05448c1d44b3ac2a46d54b40c3f2653fa0312 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Wed, 8 Apr 2020 18:34:20 +0800
Subject: [PATCH] Add L_DOLLAR for TYPE_RECOVERY_SET

---
 crates/ra_mbe/src/tests.rs            | 17 +++++++++++++++++
 crates/ra_parser/src/grammar/types.rs |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index a7fcea0ace..254318e239 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -1614,6 +1614,23 @@ fn test_issue_2520() {
     );
 }
 
+#[test]
+fn test_issue_3861() {
+    let macro_fixture = parse_macro(
+        r#"
+        macro_rules! rgb_color {
+            ($p:expr, $t: ty) => {
+                pub fn new() {
+                    let _ = 0 as $t << $p;
+                }
+            };
+        }
+    "#,
+    );
+
+    macro_fixture.expand_items(r#"rgb_color!(8 + 8, u32);"#);
+}
+
 #[test]
 fn test_repeat_bad_var() {
     // FIXME: the second rule of the macro should be removed and an error about
diff --git a/crates/ra_parser/src/grammar/types.rs b/crates/ra_parser/src/grammar/types.rs
index 2c00bce803..386969d2d7 100644
--- a/crates/ra_parser/src/grammar/types.rs
+++ b/crates/ra_parser/src/grammar/types.rs
@@ -7,7 +7,7 @@ pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(token_set![
     DYN_KW, L_ANGLE,
 ]);
 
-const TYPE_RECOVERY_SET: TokenSet = token_set![R_PAREN, COMMA];
+const TYPE_RECOVERY_SET: TokenSet = token_set![R_PAREN, COMMA, L_DOLLAR];
 
 pub(crate) fn type_(p: &mut Parser) {
     type_with_bounds_cond(p, true);