Merge #1222

1222: Skip Dollars when bump raw  token r=matklad a=edwin0cheng

This PR fixed a bug while parsing token_tree, it should skip all L_DOLLAR AND R_DOLLAR.

Co-authored-by: Edwin Cheng <[email protected]>

1 files changed, 9 insertions, 1 deletions

diff --git a/crates/ra_parser/src/parser.rs b/crates/ra_parser/src/parser.rs
index 99b976c4f..8eff930db 100644
--- a/crates/ra_parser/src/parser.rs
+++ b/crates/ra_parser/src/parser.rs
@@ -129,7 +129,15 @@ impl<'t> Parser<'t> {
     /// Advances the parser by one token unconditionally
     /// Mainly use in `token_tree` parsing
     pub(crate) fn bump_raw(&mut self) {
-        let kind = self.token_source.token_kind(self.token_pos);
+        let mut kind = self.token_source.token_kind(self.token_pos);
+
+        // Skip dollars, do_bump will eat these later
+        let mut i = 0;
+        while kind == SyntaxKind::L_DOLLAR || kind == SyntaxKind::R_DOLLAR {
+            kind = self.token_source.token_kind(self.token_pos + i);
+            i += 1;
+        }
+
         if kind == EOF {
             return;
         }