Better fix for stuck parser?

diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 2fc6ce1e1a64b8e6e342d00055a81fe9cbd8fecc..2335d99b3ae2a88e61e6cf6b9620d6b3f9a4e9c8 100644 (file)
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -61,7 +61,7 @@ pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> {
         LIFETIME,
     ]);
 
-const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW];
+const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW, R_DOLLAR];
 
 pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> {
     if let Some(m) = literal(p) {
@@ -565,10 +565,10 @@ fn meta_var_expr(p: &mut Parser) -> CompletedMarker {
             it
         }
         _ => {
-            while !p.at(EOF) && !p.at(R_DOLLAR) {
+            while !p.at(R_DOLLAR) {
                 p.bump_any()
             }
-            p.eat(R_DOLLAR);
+            p.bump(R_DOLLAR);
             m.complete(p, ERROR)
         }
     }